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.58 by root, Thu Jan 4 16:19:32 2007 UTC vs.
Revision 1.74 by root, Wed Mar 14 01:19:10 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001 Mark Wedel 5 * Copyright (C) 2001 Mark Wedel
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24/** 25/**
25 * \file 26 * \file
26 * Client handling. 27 * Client handling.
27 * 28 *
… …
35 * have the prototype of (char *data, int datalen, int client_num). This 36 * have the prototype of (char *data, int datalen, int client_num). This
36 * way, we can use one dispatch table. 37 * way, we can use one dispatch table.
37 * 38 *
38 * esrv_map_new starts updating the map 39 * esrv_map_new starts updating the map
39 * 40 *
40 * esrv_map_setbelow allows filling in all of the faces for the map.
41 * if a face has not already been sent to the client, it is sent now.
42 *
43 */ 41 */
44 42
45#include <global.h> 43#include <global.h>
46#include <sproto.h> 44#include <sproto.h>
47 45
… …
100 * that much difference in bandwidth. 98 * that much difference in bandwidth.
101 */ 99 */
102 mx = ns->mapx; 100 mx = ns->mapx;
103 my = ns->mapy; 101 my = ns->mapy;
104 102
105 if (ns->mapmode == Map1aCmd)
106 {
107 mx += MAX_HEAD_OFFSET;
108 my += MAX_HEAD_OFFSET;
109 }
110
111 /* 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
112 * (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,
113 * if the destination x or y coordinate is outside the viewable 105 * if the destination x or y coordinate is outside the viewable
114 * area, we clear the values - otherwise, the old values 106 * area, we clear the values - otherwise, the old values
115 * 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.
… …
146 pl->ns->send_packet ("newmap"); 138 pl->ns->send_packet ("newmap");
147 139
148 pl->ns->floorbox_reset (); 140 pl->ns->floorbox_reset ();
149} 141}
150 142
151/** check for map change and send new map data */ 143/** check for map/region change and send new map data */
152static void 144static void
153check_map_change (player *pl) 145check_map_change (player *pl)
154{ 146{
155 client &socket = *pl->ns; 147 client &socket = *pl->ns;
156 object *ob = pl->ob; 148 object *ob = pl->ob;
… …
200 } 192 }
201 } 193 }
202 194
203 socket.current_x = ob->x; 195 socket.current_x = ob->x;
204 socket.current_y = ob->y; 196 socket.current_y = ob->y;
197
198 region *reg = ob->region ();
199 if (socket.current_region != reg)
200 {
201 socket.current_region = reg;
202 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
203 }
205} 204}
206 205
207/** 206/**
208 * RequestInfo is sort of a meta command. There is some specific 207 * RequestInfo is sort of a meta command. There is some specific
209 * request of information, but we call other functions to provide 208 * request of information, but we call other functions to provide
… …
432 } 431 }
433 else if (!strcmp (cmd, "newmapcmd")) 432 else if (!strcmp (cmd, "newmapcmd"))
434 { 433 {
435 ns->newmapcmd = atoi (param); 434 ns->newmapcmd = atoi (param);
436 safe_strcat (cmdback, param, &slen, HUGE_BUF); 435 safe_strcat (cmdback, param, &slen, HUGE_BUF);
437// } else if (!strcmp(cmd,"plugincmd")) {
438// ns->plugincmd = atoi(param);
439// safe_strcat(cmdback, param, &slen, HUGE_BUF);
440 } 436 }
441 else if (!strcmp (cmd, "mapinfocmd")) 437 else if (!strcmp (cmd, "mapinfocmd"))
442 { 438 {
443 ns->mapinfocmd = atoi (param); 439 ns->mapinfocmd = atoi (param);
444 safe_strcat (cmdback, "1", &slen, HUGE_BUF); 440 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
… …
500 if (*cp == 'x' || *cp == 'X') 496 if (*cp == 'x' || *cp == 'X')
501 { 497 {
502 y = atoi (cp + 1); 498 y = atoi (cp + 1);
503 break; 499 break;
504 } 500 }
501
505 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) 502 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
506 { 503 {
507 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); 504 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
508 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); 505 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
509 } 506 }
… …
686 683
687 ns->send_packet (cmdback); 684 ns->send_packet (cmdback);
688} 685}
689 686
690/** 687/**
691 * A lot like the old AskSmooth (in fact, now called by AskSmooth).
692 * Basically, it makes no sense to wait for the client to request a
693 * a piece of data from us that we know the client wants. So
694 * if we know the client wants it, might as well push it to the
695 * client.
696 */
697static void
698SendSmooth (client *ns, uint16 face)
699{
700 uint16 smoothface;
701
702 /* If we can't find a face, return and set it so we won't try to send this
703 * again.
704 */
705 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
706 {
707
708 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);
709 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
710 return;
711 }
712
713 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
714 esrv_send_face (ns, smoothface, 0);
715
716 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
717
718 packet sl ("smooth");
719
720 sl << uint16 (face)
721 << uint16 (smoothface);
722
723 ns->send_packet (sl);
724}
725
726 /**
727 * Tells client the picture it has to use 688 * Tells client the picture it has to use
728 * to smooth a picture number given as argument. 689 * to smooth a picture number given as argument.
729 */ 690 */
730void 691void
731AskSmooth (char *buf, int len, client *ns) 692AskSmooth (char *buf, int len, client *ns)
732{ 693{
733 SendSmooth (ns, atoi (buf)); 694 ns->send_face (atoi (buf));
734} 695}
735 696
736/** 697/**
737 * This handles the general commands from the client (ie, north, fire, cast, 698 * This handles the general commands from the client (ie, north, fire, cast,
738 * etc.) 699 * etc.)
… …
797 * commands. 758 * commands.
798 */ 759 */
799 pl->count = 0; 760 pl->count = 0;
800 761
801 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 762 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
802 int time = FABS (pl->ob->speed) < 0.001 763 int time = fabs (pl->ob->speed) < 0.001
803 ? time = MAX_TIME * 100 764 ? time = MAX_TIME * 100
804 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 765 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
805 766
806 /* Send confirmation of command execution now */ 767 /* Send confirmation of command execution now */
807 packet sl ("comc"); 768 packet sl ("comc");
808 sl << uint16 (cmdid) << uint32 (time); 769 sl << uint16 (cmdid) << uint32 (time);
809 pl->ns->send_packet (sl); 770 pl->ns->send_packet (sl);
… …
845 806
846 case ST_CHANGE_CLASS: 807 case ST_CHANGE_CLASS:
847 key_change_class (pl->ob, buf[0]); 808 key_change_class (pl->ob, buf[0]);
848 break; 809 break;
849 810
850 case ST_CONFIRM_QUIT:
851 key_confirm_quit (pl->ob, buf[0]);
852 break;
853
854 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 811 case ST_GET_PARTY_PASSWORD: /* Get password for party */
855 receive_party_password (pl->ob, 13); 812 receive_party_password (pl->ob, 13);
856 break; 813 break;
857 814
858 default: 815 default:
… …
878 835
879 ns->cs_version = atoi (buf); 836 ns->cs_version = atoi (buf);
880 ns->sc_version = ns->cs_version; 837 ns->sc_version = ns->cs_version;
881 838
882 LOG (llevDebug, "connection from client <%s>\n", buf); 839 LOG (llevDebug, "connection from client <%s>\n", buf);
883
884 840
885 //TODO: should log here just for statistics 841 //TODO: should log here just for statistics
886 842
887 //if (VERSION_CS != ns->cs_version) 843 //if (VERSION_CS != ns->cs_version)
888 // unchecked; 844 // unchecked;
… …
1010esrv_update_stats (player *pl) 966esrv_update_stats (player *pl)
1011{ 967{
1012 char buf[MAX_BUF]; 968 char buf[MAX_BUF];
1013 uint16 flags; 969 uint16 flags;
1014 970
971 client *ns = pl->ns;
1015 if (!pl->ns) 972 if (!ns)
1016 return; 973 return;
1017 974
975 object *ob = pl->ob;
976 if (!ob)
977 return;
978
1018 packet sl ("stats"); 979 packet sl ("stats");
1019 980
1020 if (pl->ob)
1021 {
1022 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 981 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1023 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 982 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1024 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 983 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1025 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 984 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1026 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 985 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1027 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 986 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1028 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 987 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1029 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 988 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1030 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 989 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1031 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); 990 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1032 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); 991 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1033 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); 992 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1034 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 993 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1035 }
1036 994
1037 for (int s = 0; s < NUM_SKILLS; s++) 995 for (int s = 0; s < NUM_SKILLS; s++)
1038 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 996 if (object *skill = pl->last_skill_ob[s])
997 if (skill->stats.exp != ns->last_skill_exp [s])
1039 { 998 {
999 ns->last_skill_exp [s] = skill->stats.exp;
1000
1040 /* Always send along the level if exp changes. This is only 1001 /* Always send along the level if exp changes. This is only
1041 * 1 extra byte, but keeps processing simpler. 1002 * 1 extra byte, but keeps processing simpler.
1042 */ 1003 */
1043 sl << uint8 (s + CS_STAT_SKILLINFO) 1004 sl << uint8 (s + CS_STAT_SKILLINFO)
1044 << uint8 (pl->last_skill_ob[s]->level) 1005 << uint8 (skill->level)
1045 << uint64 (pl->last_skill_ob[s]->stats.exp); 1006 << uint64 (skill->stats.exp);
1046
1047 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1048 } 1007 }
1049 1008
1050 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 1009 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1051 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1010 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1052 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1011 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1053 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1012 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1054 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1013 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1055 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1014 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1056 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1015 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1057 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 1016 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1058 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 1017 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1018
1059 flags = 0; 1019 flags = 0;
1060 1020
1061 if (pl->fire_on) 1021 if (pl->fire_on)
1062 flags |= SF_FIREON; 1022 flags |= SF_FIREON;
1063 1023
1064 if (pl->run_on) 1024 if (pl->run_on)
1065 flags |= SF_RUNON; 1025 flags |= SF_RUNON;
1066 1026
1067 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1027 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1068 1028
1069 if (pl->ns->sc_version < 1025) 1029 if (ns->sc_version < 1025)
1070 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1030 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1071 else 1031 else
1072 for (int i = 0; i < NROFATTACKS; i++) 1032 for (int i = 0; i < NROFATTACKS; i++)
1073 { 1033 {
1074 /* Skip ones we won't send */ 1034 /* Skip ones we won't send */
1075 if (atnr_cs_stat[i] == -1) 1035 if (atnr_cs_stat[i] == -1)
1076 continue; 1036 continue;
1077 1037
1078 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1038 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1079 } 1039 }
1080 1040
1081 if (pl->ns->monitor_spells) 1041 if (pl->ns->monitor_spells)
1082 { 1042 {
1083 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1043 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1084 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1044 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1085 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1045 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1086 } 1046 }
1087 1047
1088 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1048 rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1089 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE); 1049 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1090 set_title (pl->ob, buf); 1050 set_title (ob, buf);
1091 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE); 1051 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1092 1052
1093 /* Only send it away if we have some actual data */ 1053 /* Only send it away if we have some actual data */
1094 if (sl.length () > 6) 1054 if (sl.length () > 6)
1095 pl->ns->send_packet (sl); 1055 ns->send_packet (sl);
1096} 1056}
1097 1057
1098/** 1058/**
1099 * Tells the client that here is a player it should start using. 1059 * Tells the client that here is a player it should start using.
1100 */ 1060 */
1101void 1061void
1102esrv_new_player (player *pl, uint32 weight) 1062esrv_new_player (player *pl, uint32 weight)
1103{ 1063{
1104 pl->last_weight = weight;
1105
1106 packet sl ("player"); 1064 packet sl ("player");
1107 1065
1108 sl << uint32 (pl->ob->count) 1066 sl << uint32 (pl->ob->count)
1109 << uint32 (weight) 1067 << uint32 (weight)
1110 << uint32 (pl->ob->face->number) 1068 << uint32 (pl->ob->face)
1111 << data8 (pl->ob->name); 1069 << data8 (pl->ob->name);
1112 1070
1071 pl->ns->last_weight = weight;
1113 pl->ns->send_packet (sl); 1072 pl->ns->send_packet (sl);
1114 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1073 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1115} 1074}
1116
1117/**
1118 * Need to send an animation sequence to the client.
1119 * We will send appropriate face commands to the client if we haven't
1120 * sent them the face yet (this can become quite costly in terms of
1121 * how much we are sending - on the other hand, this should only happen
1122 * when the player logs in and picks stuff up.
1123 */
1124void
1125esrv_send_animation (client * ns, short anim_num)
1126{
1127 /* Do some checking on the anim_num we got. Note that the animations
1128 * are added in contigous order, so if the number is in the valid
1129 * range, it must be a valid animation.
1130 */
1131 if (anim_num < 0 || anim_num > num_animations)
1132 {
1133 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1134 return;
1135 }
1136
1137 packet sl ("anim");
1138
1139 sl << uint16 (anim_num)
1140 << uint16 (0); /* flags - not used right now */
1141
1142 /* Build up the list of faces. Also, send any information (ie, the
1143 * the face itself) down to the client.
1144 */
1145 for (int i = 0; i < animations[anim_num].num_animations; i++)
1146 {
1147 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1148 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1149
1150 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1151 }
1152
1153 ns->send_packet (sl);
1154
1155 ns->anims_sent[anim_num] = 1;
1156}
1157
1158 1075
1159/****************************************************************************** 1076/******************************************************************************
1160 * 1077 *
1161 * Start of map related commands. 1078 * Start of map related commands.
1162 * 1079 *
1163 ******************************************************************************/ 1080 ******************************************************************************/
1164 1081
1165/**
1166 * This adds face_num to a map cell at x,y. If the client doesn't have
1167 * the face yet, we will also send it.
1168 */
1169static void
1170esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1171{
1172 if (newmap->cells[x][y].count >= MAP_LAYERS)
1173 {
1174 //TODO: one or the other, can't both have abort and return, verify and act
1175 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1176 return;
1177 abort ();
1178 }
1179
1180 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1181 newmap->cells[x][y].count++;
1182
1183 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1184 esrv_send_face (ns, face_num, 0);
1185}
1186
1187/** Clears a map cell */ 1082/** Clears a map cell */
1188static void 1083static void
1189map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1084map_clearcell (struct MapCell *cell, int count)
1190{ 1085{
1191 cell->faces[0] = face0; 1086 cell->faces[0] = 0;
1192 cell->faces[1] = face1; 1087 cell->faces[1] = 0;
1193 cell->faces[2] = face2; 1088 cell->faces[2] = 0;
1194 cell->count = count; 1089 cell->count = count;
1195 cell->stat_hp = 0; 1090 cell->stat_hp = 0;
1196 cell->flags = 0; 1091 cell->flags = 0;
1197 cell->player = 0; 1092 cell->player = 0;
1198} 1093}
1199 1094
1200#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1201#define MAX_LAYERS 3 1095#define MAX_LAYERS 3
1202
1203/* Using a global really isn't a good approach, but saves the over head of
1204 * allocating and deallocating such a block of data each time run through,
1205 * and saves the space of allocating this in the socket object when we only
1206 * need it for this cycle. If the server is ever threaded, this needs to be
1207 * re-examined.
1208 */
1209static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1210
1211/**
1212 * Returns true if any of the heads for this
1213 * space is set. Returns false if all are blank - this is used
1214 * for empty space checking.
1215 */
1216static inline int
1217have_head (int ax, int ay)
1218{
1219 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1220 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1221 return 1;
1222
1223 return 0;
1224}
1225
1226/**
1227 * check_head is a bit simplistic version of update_space below.
1228 * basically, it only checks the that the head on space ax,ay at layer
1229 * needs to get sent - if so, it adds the data, sending the head
1230 * if needed, and returning 1. If this no data needs to get
1231 * sent, it returns zero.
1232 */
1233static int
1234check_head (packet &sl, client &ns, int ax, int ay, int layer)
1235{
1236 short face_num;
1237
1238 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1239 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1240 else
1241 face_num = 0;
1242
1243 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1244 {
1245 sl << uint16 (face_num);
1246 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1247 esrv_send_face (&ns, face_num, 0);
1248
1249 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1250 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1251 return 1;
1252 }
1253
1254 return 0; /* No change */
1255}
1256 1096
1257/** 1097/**
1258 * Removes the need to replicate the same code for each layer. 1098 * Removes the need to replicate the same code for each layer.
1259 * this returns true if this space is now in fact different than 1099 * this returns true if this space is now in fact different than
1260 * it was. 1100 * it was.
… …
1274 * actually match. 1114 * actually match.
1275 */ 1115 */
1276static int 1116static int
1277update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1117update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1278{ 1118{
1279 object *ob, *head;
1280 uint16 face_num; 1119 uint16 face_num;
1281 int bx, by, i; 1120 int bx, by, i;
1282 1121
1283 /* If there is a multipart object stored away, treat that as more important.
1284 * If not, then do the normal processing.
1285 */
1286 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1287
1288 /* Check to see if this head is part of the set of objects
1289 * we would normally send for this space. If so, then
1290 * don't use the head value. We need to do the check
1291 * here and not when setting up the heads[] value for two reasons -
1292 * 1) the heads[] values will get used even if the space is not visible.
1293 * 2) its possible the head is not on the same map as a part, and I'd
1294 * rather not need to do the map translation overhead.
1295 * 3) We need to do some extra checking to make sure that we will
1296 * otherwise send the image as this layer, eg, either it matches
1297 * the head value, or is not multipart.
1298 */
1299 if (head && !head->more)
1300 {
1301 for (i = 0; i < MAP_LAYERS; i++)
1302 {
1303 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1304 if (!ob)
1305 continue;
1306
1307 if (ob->head)
1308 ob = ob->head;
1309
1310 if (ob == head)
1311 {
1312 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1313 head = NULL;
1314 break;
1315 }
1316 }
1317 }
1318
1319 ob = head;
1320 if (!ob)
1321 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1122 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1322 1123
1323 /* If there is no object for this space, or if the face for the object 1124 /* If there is no object for this space, or if the face for the object
1324 * is the blank face, set the face number to zero. 1125 * is the blank face, set the face number to zero.
1325 * else if we have the stored head object for this space, that takes 1126 * else if we have the stored head object for this space, that takes
1326 * precedence over the other object for this space. 1127 * precedence over the other object for this space.
1327 * otherwise, we do special head processing 1128 * otherwise, we do special head processing
1328 */ 1129 */
1329 if (!ob || ob->face == blank_face) 1130 if (!ob || ob->face == blank_face)
1330 face_num = 0; 1131 face_num = 0;
1331 else if (head)
1332 {
1333 /* if this is a head that had previously been stored */
1334 face_num = ob->face->number;
1335 }
1336 else 1132 else
1337 {
1338 /* if the faces for the different parts of a multipart object
1339 * are the same, we only want to send the bottom right most
1340 * portion of the object. That info is in the tail_.. values
1341 * of the head. Note that for the head itself, ob->head will
1342 * be null, so we only do this block if we are working on
1343 * a tail piece.
1344 */
1345
1346 /* tail_x and tail_y will only be set in the head object. If
1347 * this is the head object and these are set, we proceed
1348 * with logic to only send bottom right. Similarly, if
1349 * this is one of the more parts but the head has those values
1350 * set, we want to do the processing. There can be cases where
1351 * the head is not visible but one of its parts is, so we just
1352 * can always expect that ob->arch->tail_x will be true for all
1353 * object we may want to display.
1354 */
1355 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1356 {
1357
1358 if (ob->head)
1359 head = ob->head;
1360 else
1361 head = ob;
1362
1363 /* Basically figure out where the offset is from where we are right
1364 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1365 * piece is from the head, and the tail is where the tail is from the
1366 * head. Note that bx and by will equal sx and sy if we are already working
1367 * on the bottom right corner. If ob is the head, the clone values
1368 * will be zero, so the right thing will still happen.
1369 */
1370 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1371 by = sy + head->arch->tail_y - ob->arch->clone.y;
1372
1373 /* I don't think this can ever happen, but better to check for it just
1374 * in case.
1375 */
1376 if (bx < sx || by < sy)
1377 {
1378 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1379 face_num = 0;
1380 }
1381 /* single part object, multipart object with non merged faces,
1382 * of multipart object already at lower right.
1383 */
1384 else if (bx == sx && by == sy)
1385 {
1386 face_num = ob->face->number;
1387
1388 /* if this face matches one stored away, clear that one away.
1389 * this code relies on the fact that the map1 commands
1390 * goes from 2 down to 0.
1391 */
1392 for (i = 0; i < MAP_LAYERS; i++)
1393 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1394 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1395 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1396 }
1397 else
1398 {
1399 /* If this head is stored away, clear it - otherwise,
1400 * there can be cases where a object is on multiple layers -
1401 * we only want to send it once.
1402 */
1403 face_num = head->face->number;
1404 for (i = 0; i < MAP_LAYERS; i++)
1405 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1406 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1407 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1408
1409 /* First, try to put the new head on the same layer. If that is used up,
1410 * then find another layer.
1411 */
1412 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1413 {
1414 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1415 }
1416 else
1417 for (i = 0; i < MAX_LAYERS; i++)
1418 {
1419 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1420 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1421 {
1422 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1423 }
1424 }
1425 face_num = 0; /* Don't send this object - we'll send the head later */
1426 }
1427 }
1428 else
1429 {
1430 /* In this case, we are already at the lower right or single part object, 1133 /* In this case, we are already at the lower right or single part object,
1431 * so nothing special 1134 * so nothing special
1432 */
1433 face_num = ob->face->number;
1434
1435 /* clear out any head entries that have the same face as this one */
1436 for (bx = 0; bx < layer; bx++)
1437 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1438 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1439 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1440 }
1441 } /* else not already head object or blank face */
1442
1443 /* This is a real hack. Basically, if we have nothing to send for this layer,
1444 * but there is a head on the next layer, send that instead.
1445 * Without this, what happens is you can get the case where the player stands
1446 * on the same space as the head. However, if you have overlapping big objects
1447 * of the same type, what happens then is it doesn't think it needs to send
1448 * This tends to make stacking also work/look better.
1449 */ 1135 */
1450 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1451 {
1452 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1453 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1454 }
1455
1456 /* Another hack - because of heads and whatnot, this face may match one
1457 * we already sent for a lower layer. In that case, don't send
1458 * this one.
1459 */
1460 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1461 face_num = 0; 1136 face_num = ob->face;
1462 1137
1463 /* We've gotten what face we want to use for the object. Now see if 1138 /* We've gotten what face we want to use for the object. Now see if
1464 * if it has changed since we last sent it to the client. 1139 * if it has changed since we last sent it to the client.
1465 */ 1140 */
1466 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 1141 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
1467 { 1142 {
1468 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 1143 ns.lastmap.cells[sx][sy].faces[layer] = face_num;
1144
1469 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1145 if (!ns.faces_sent[face_num])
1146 if (ob)
1147 ns.send_faces (ob);
1148 else
1470 esrv_send_face (&ns, face_num, 0); 1149 ns.send_face (face_num);
1471 1150
1472 sl << uint16 (face_num); 1151 sl << uint16 (face_num);
1473 return 1; 1152 return 1;
1474 } 1153 }
1475 1154
… …
1493 * holds the old values. 1172 * holds the old values.
1494 * layer is the layer to update, with 2 being the floor and 0 the 1173 * layer is the layer to update, with 2 being the floor and 0 the
1495 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1174 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1496 * take. 1175 * take.
1497 */ 1176 */
1498
1499static inline int 1177static inline int
1500update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1178update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1501{ 1179{
1502 object *ob;
1503 int smoothlevel; /* old face_num; */
1504
1505 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1180 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1506 1181
1507 /* If there is no object for this space, or if the face for the object 1182 /* If there is no object for this space, or if the face for the object
1508 * is the blank face, set the smoothlevel to zero. 1183 * is the blank face, set the smoothlevel to zero.
1509 */ 1184 */
1510 if (!ob || ob->face == blank_face) 1185 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1511 smoothlevel = 0;
1512 else
1513 {
1514 smoothlevel = ob->smoothlevel;
1515 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1516 SendSmooth (&ns, ob->face->number);
1517 } /* else not already head object or blank face */
1518 1186
1519 /* We've gotten what face we want to use for the object. Now see if 1187 /* We've gotten what face we want to use for the object. Now see if
1520 * if it has changed since we last sent it to the client. 1188 * if it has changed since we last sent it to the client.
1521 */ 1189 */
1522 if (smoothlevel > 255) 1190 if (smoothlevel > 255)
… …
1550 if (ns->EMI_smooth) 1218 if (ns->EMI_smooth)
1551 result += 1; /*One byte for smoothlevel */ 1219 result += 1; /*One byte for smoothlevel */
1552 } 1220 }
1553 1221
1554 return result; 1222 return result;
1223}
1224
1225// prefetch (and touch) all maps within a specific distancd
1226static void
1227prefetch_surrounding_maps (maptile *map, int distance)
1228{
1229 map->last_access = runtime;
1230
1231 if (--distance)
1232 for (int dir = 4; --dir; )
1233 if (const shstr &path = map->tile_path [dir])
1234 if (maptile *&neigh = map->tile_map [dir])
1235 prefetch_surrounding_maps (neigh, distance);
1236 else
1237 neigh = maptile::find_async (path, map);
1238}
1239
1240// prefetch a generous area around the player
1241static void
1242prefetch_surrounding_maps (object *op)
1243{
1244 prefetch_surrounding_maps (op->map, 3);
1555} 1245}
1556 1246
1557/** 1247/**
1558 * This function uses the new map1 protocol command to send the map 1248 * This function uses the new map1 protocol command to send the map
1559 * to the client. It is necessary because the old map command supports 1249 * to the client. It is necessary because the old map command supports
… …
1577 * look like. 1267 * look like.
1578 */ 1268 */
1579void 1269void
1580draw_client_map1 (object *pl) 1270draw_client_map1 (object *pl)
1581{ 1271{
1582 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1272 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1583 sint16 nx, ny; 1273 sint16 nx, ny;
1584 int estartlen, eoldlen; 1274 int estartlen, eoldlen;
1585 uint16 mask, emask;
1586 uint8 eentrysize; 1275 uint8 eentrysize;
1587 uint16 ewhatstart, ewhatflag; 1276 uint16 ewhatstart, ewhatflag;
1588 uint8 extendedinfos; 1277 uint8 extendedinfos;
1589 maptile *m; 1278 maptile *m;
1590 1279
1591 client &socket = *pl->contr->ns; 1280 client &socket = *pl->contr->ns;
1592 1281
1593 if (!pl->active ()) 1282 if (!pl->active)
1594 return; 1283 return;
1595 1284
1596 check_map_change (pl->contr); 1285 check_map_change (pl->contr);
1286 prefetch_surrounding_maps (pl);
1597 1287
1598 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1288 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1599 packet esl; 1289 packet esl;
1600 1290
1601 startlen = sl.length (); 1291 startlen = sl.length ();
… …
1624 ewhatstart = 0; 1314 ewhatstart = 0;
1625 ewhatflag = 0; 1315 ewhatflag = 0;
1626 estartlen = 0; 1316 estartlen = 0;
1627 } 1317 }
1628 1318
1629 /* Init data to zero */
1630 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1631
1632 /* x,y are the real map locations. ax, ay are viewport relative 1319 /* x,y are the real map locations. ax, ay are viewport relative
1633 * locations. 1320 * locations.
1634 */ 1321 */
1635 ay = 0; 1322 ay = 0;
1636 1323
… …
1638 * but that started to get a bit messy to look at. 1325 * but that started to get a bit messy to look at.
1639 */ 1326 */
1640 max_x = pl->x + (socket.mapx + 1) / 2; 1327 max_x = pl->x + (socket.mapx + 1) / 2;
1641 max_y = pl->y + (socket.mapy + 1) / 2; 1328 max_y = pl->y + (socket.mapy + 1) / 2;
1642 1329
1643 if (socket.mapmode == Map1aCmd)
1644 {
1645 max_x += MAX_HEAD_OFFSET;
1646 max_y += MAX_HEAD_OFFSET;
1647 }
1648
1649 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1330 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1650 { 1331 {
1651 ax = 0; 1332 ax = 0;
1652 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1333 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1653 { 1334 {
1335 int emask, mask;
1654 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1336 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1655 1337
1656 /* If this space is out of the normal viewable area, we only check
1657 * the heads value ax or ay will only be greater than what
1658 * the client wants if using the map1a command - this is because
1659 * if the map1a command is not used, max_x and max_y will be
1660 * set to lower values.
1661 */
1662 if (ax >= socket.mapx || ay >= socket.mapy)
1663 {
1664 int i, got_one;
1665
1666 oldlen = sl.length ();
1667
1668 sl << uint16 (mask);
1669
1670 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1671 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1672 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1673
1674 /* If all we are doing is sending 0 (blank) faces, we don't
1675 * actually need to send that - just the coordinates
1676 * with no faces tells the client to blank out the
1677 * space.
1678 */
1679 got_one = 0;
1680 for (i = oldlen + 2; i < sl.length (); i++)
1681 if (sl[i])
1682 got_one = 1;
1683
1684 if (got_one && (mask & 0xf))
1685 sl[oldlen + 1] = mask & 0xff;
1686 else
1687 { /*either all faces blank, either no face at all */
1688 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1689 sl.reset (oldlen + 2);
1690 else
1691 sl.reset (oldlen);
1692 }
1693
1694 /*What concerns extendinfos, nothing to be done for now
1695 * (perhaps effects layer later)
1696 */
1697 continue; /* don't do processing below */
1698 }
1699
1700 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1338 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1701
1702 d = pl->contr->blocked_los[ax][ay];
1703 1339
1704 /* If the coordinates are not valid, or it is too dark to see, 1340 /* If the coordinates are not valid, or it is too dark to see,
1705 * we tell the client as such 1341 * we tell the client as such
1706 */ 1342 */
1707 nx = x; 1343 nx = x;
… …
1715 * of the map, it shouldn't have a head 1351 * of the map, it shouldn't have a head
1716 */ 1352 */
1717 if (lastcell.count != -1) 1353 if (lastcell.count != -1)
1718 { 1354 {
1719 sl << uint16 (mask); 1355 sl << uint16 (mask);
1720 map_clearcell (&lastcell, 0, 0, 0, -1); 1356 map_clearcell (&lastcell, -1);
1721 } 1357 }
1358
1359 continue;
1722 } 1360 }
1361
1362 m->touch ();
1363
1364 int d = pl->contr->blocked_los[ax][ay];
1365
1723 else if (d > 3) 1366 if (d > 3)
1724 { 1367 {
1725 m->touch ();
1726 1368
1727 int need_send = 0, count; 1369 int need_send = 0, count;
1728 1370
1729 /* This block deals with spaces that are not visible for whatever 1371 /* This block deals with spaces that are not visible for whatever
1730 * reason. Still may need to send the head for this space. 1372 * reason. Still may need to send the head for this space.
1731 */ 1373 */
1732 1374
1733 oldlen = sl.length (); 1375 oldlen = sl.length ();
1734 1376
1735 sl << uint16 (mask); 1377 sl << uint16 (mask);
… …
1737 if (lastcell.count != -1) 1379 if (lastcell.count != -1)
1738 need_send = 1; 1380 need_send = 1;
1739 1381
1740 count = -1; 1382 count = -1;
1741 1383
1742 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1743 {
1744 /* Now check to see if any heads need to be sent */
1745
1746 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1747 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1748 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1749
1750 lastcell.count = count;
1751 }
1752 else
1753 {
1754 /* properly clear a previously sent big face */ 1384 /* properly clear a previously sent big face */
1755 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1385 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1756 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1386 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1757 need_send = 1; 1387 need_send = 1;
1758 1388
1759 map_clearcell (&lastcell, 0, 0, 0, count); 1389 map_clearcell (&lastcell, count);
1760 }
1761 1390
1762 if ((mask & 0xf) || need_send) 1391 if ((mask & 0xf) || need_send)
1763 sl[oldlen + 1] = mask & 0xff; 1392 sl[oldlen + 1] = mask & 0xff;
1764 else 1393 else
1765 sl.reset (oldlen); 1394 sl.reset (oldlen);
1766 } 1395 }
1767 else 1396 else
1768 { 1397 {
1769 m->touch ();
1770
1771 /* In this block, the space is visible or there are head objects 1398 /* In this block, the space is visible.
1772 * we need to send.
1773 */ 1399 */
1774 1400
1775 /* Rather than try to figure out what everything that we might 1401 /* Rather than try to figure out what everything that we might
1776 * need to send is, then form the packet after that, 1402 * need to send is, then form the packet after that,
1777 * we presume that we will in fact form a packet, and update 1403 * we presume that we will in fact form a packet, and update
… …
1780 * is done. 1406 * is done.
1781 * I think this is simpler than doing a bunch of checks to see 1407 * I think this is simpler than doing a bunch of checks to see
1782 * what if anything we need to send, setting the bits, then 1408 * what if anything we need to send, setting the bits, then
1783 * doing those checks again to add the real data. 1409 * doing those checks again to add the real data.
1784 */ 1410 */
1785 oldlen = sl.length (); 1411 oldlen = sl.length ();
1786 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1787 eoldlen = esl.length (); 1412 eoldlen = esl.length ();
1788 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1413
1789 sl << uint16 (mask); 1414 sl << uint16 (mask);
1790 1415
1791 if (socket.ext_mapinfos) 1416 if (socket.ext_mapinfos)
1792 esl << uint16 (emask); 1417 esl << uint16 (emask);
1793 1418
… …
1898 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1523 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1899 emask |= 0x2; 1524 emask |= 0x2;
1900 1525
1901 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) 1526 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1902 { 1527 {
1903 if (lastcell.faces[0] != pl->face->number) 1528 if (lastcell.faces[0] != pl->face)
1904 { 1529 {
1905 lastcell.faces[0] = pl->face->number; 1530 lastcell.faces[0] = pl->face;
1906 mask |= 0x1; 1531 mask |= 0x1;
1907 1532
1908 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 1533 socket.send_faces (pl);
1909 esrv_send_face (&socket, pl->face->number, 0);
1910 1534
1911 sl << uint16 (pl->face->number); 1535 sl << uint16 (pl->face);
1912 } 1536 }
1913 } 1537 }
1914 else 1538 else
1915 { 1539 {
1916 /* Top face */ 1540 /* Top face */
… …
1946 if (!(sl.length () > startlen || socket.sent_scroll)) 1570 if (!(sl.length () > startlen || socket.sent_scroll))
1947 { 1571 {
1948 /* No map data will follow, so don't say the client 1572 /* No map data will follow, so don't say the client
1949 * it doesn't need draw! 1573 * it doesn't need draw!
1950 */ 1574 */
1951 ewhatflag &= (~EMI_NOREDRAW); 1575 ewhatflag &= ~EMI_NOREDRAW;
1952 esl[ewhatstart + 1] = ewhatflag & 0xff; 1576 esl[ewhatstart + 1] = ewhatflag & 0xff;
1953 } 1577 }
1954 1578
1955 if (esl.length () > estartlen) 1579 if (esl.length () > estartlen)
1956 socket.send_packet (esl); 1580 socket.send_packet (esl);
… …
1968 */ 1592 */
1969void 1593void
1970draw_client_map (object *pl) 1594draw_client_map (object *pl)
1971{ 1595{
1972 int i, j; 1596 int i, j;
1973 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1597 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1974 New_Face *face, *floor;
1975 New_Face *floor2;
1976 int d, mflags; 1598 int mflags;
1977 struct Map newmap; 1599 struct Map newmap;
1978 maptile *m, *pm; 1600 maptile *m, *pm;
1979 1601
1980 if (pl->type != PLAYER) 1602 if (pl->type != PLAYER)
1981 { 1603 {
… …
2162 1784
2163/* appends the spell *spell to the Socklist we will send the data to. */ 1785/* appends the spell *spell to the Socklist we will send the data to. */
2164static void 1786static void
2165append_spell (player *pl, packet &sl, object *spell) 1787append_spell (player *pl, packet &sl, object *spell)
2166{ 1788{
2167 int len, i, skill = 0; 1789 int i, skill = 0;
2168 1790
2169 if (!(spell->name)) 1791 if (!(spell->name))
2170 { 1792 {
2171 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1793 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2172 return; 1794 return;
… …
2184 if (!strcmp (spell->skill, skill_names[i])) 1806 if (!strcmp (spell->skill, skill_names[i]))
2185 { 1807 {
2186 skill = i + CS_STAT_SKILLINFO; 1808 skill = i + CS_STAT_SKILLINFO;
2187 break; 1809 break;
2188 } 1810 }
1811 }
1812
1813 // spells better have a face
1814 if (!spell->face)
1815 {
1816 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1817 spell->face = face_find ("burnout.x11", blank_face);
2189 } 1818 }
2190 1819
2191 /* send the current values */ 1820 /* send the current values */
2192 sl << uint32 (spell->count) 1821 sl << uint32 (spell->count)
2193 << uint16 (spell->level) 1822 << uint16 (spell->level)
… …
2195 << uint16 (spell->last_sp) 1824 << uint16 (spell->last_sp)
2196 << uint16 (spell->last_grace) 1825 << uint16 (spell->last_grace)
2197 << uint16 (spell->last_eat) 1826 << uint16 (spell->last_eat)
2198 << uint8 (skill) 1827 << uint8 (skill)
2199 << uint32 (spell->path_attuned) 1828 << uint32 (spell->path_attuned)
2200 << uint32 (spell->face ? spell->face->number : 0) 1829 << uint32 (spell->face)
2201 << data8 (spell->name) 1830 << data8 (spell->name)
2202 << data16 (spell->msg); 1831 << data16 (spell->msg);
2203} 1832}
2204 1833
2205/** 1834/**
… …
2220 1849
2221 packet sl ("addspell"); 1850 packet sl ("addspell");
2222 1851
2223 if (!spell) 1852 if (!spell)
2224 { 1853 {
2225 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1854 for (spell = pl->ob->inv; spell; spell = spell->below)
2226 { 1855 {
2227 /* were we to simply keep appending data here, we could exceed 1856 /* were we to simply keep appending data here, we could exceed
2228 * MAXSOCKBUF if the player has enough spells to add, we know that 1857 * MAXSOCKBUF if the player has enough spells to add, we know that
2229 * append_spells will always append 19 data bytes, plus 4 length 1858 * append_spells will always append 19 data bytes, plus 4 length
2230 * bytes and 3 strings (because that is the spec) so we need to 1859 * bytes and 3 strings (because that is the spec) so we need to

Diff Legend

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