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.129 by root, Tue May 6 19:37:01 2008 UTC vs.
Revision 1.150 by root, Mon Oct 12 14:00:59 2009 UTC

… …
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/** 25/**
… …
98 */ 99 */
99 mx = ns->mapx; 100 mx = ns->mapx;
100 my = ns->mapy; 101 my = ns->mapy;
101 102
102 /* 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
103 * (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,
104 * if the destination x or y coordinate is outside the viewable 105 * if the destination x or y coordinate is outside the viewable
105 * area, we clear the values - otherwise, the old values 106 * area, we clear the values - otherwise, the old values
106 * 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.
107 */ 108 */
108 for (x = 0; x < mx; x++) 109 for (x = 0; x < mx; x++)
109 {
110 for (y = 0; y < my; y++) 110 for (y = 0; y < my; y++)
111 {
112 if (x >= ns->mapx || y >= ns->mapy) 111 if (x >= ns->mapx || y >= ns->mapy)
113 /* clear cells outside the viewable area */ 112 /* clear cells outside the viewable area */
114 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 113 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
115 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) 114 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
116 /* clear newly visible tiles within the viewable area */ 115 /* clear newly visible tiles within the viewable area */
117 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 116 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
118 else 117 else
119 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 118 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
120 }
121 }
122 119
123 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 120 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
124 121
125 /* Make sure that the next "map1" command will be sent (even if it is 122 /* Make sure that the next "map1" command will be sent (even if it is
126 * empty). 123 * empty).
… …
141 pl->ns->send_packet ("newmap"); 138 pl->ns->send_packet ("newmap");
142 139
143 pl->ns->floorbox_reset (); 140 pl->ns->floorbox_reset ();
144} 141}
145 142
143static void
144send_map_info (player *pl)
145{
146 client &socket = *pl->ns;
147 object *ob = pl->observe;
148
149 if (socket.mapinfocmd)
150 {
151 if (ob->map && ob->map->path[0])
152 {
153 int flags = 0;
154
155 if (ob->map->tile_path[0]) flags |= 1;
156 if (ob->map->tile_path[1]) flags |= 2;
157 if (ob->map->tile_path[2]) flags |= 4;
158 if (ob->map->tile_path[3]) flags |= 8;
159
160 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
161 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
162 ob->map->width, ob->map->height, &ob->map->path);
163 }
164 else
165 socket.send_packet ("mapinfo current");
166 }
167}
168
146/** check for map/region change and send new map data */ 169/** check for map/region change and send new map data */
147static void 170static void
148check_map_change (player *pl) 171check_map_change (player *pl)
149{ 172{
150 client &socket = *pl->ns; 173 client &socket = *pl->ns;
151 object *ob = pl->observe; 174 object *ob = pl->observe;
152 175
176 region *reg = ob->region ();
177 if (socket.current_region != reg)
178 {
179 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
180 socket.current_region = reg;
181 }
182
183 // first try to aovid a full newmap on tiled map scrolls
184 if (socket.current_map != ob->map && !socket.force_newmap)
185 {
186 rv_vector rv;
187
188 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
189
190 // manhattan distance is very handy here
191 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
192 {
193 socket.current_map = ob->map;
194 socket.current_x = ob->x;
195 socket.current_y = ob->y;
196
197 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
198 socket.floorbox_reset ();
199 send_map_info (pl);
200 }
201 }
202
153 if (socket.current_map != ob->map || socket.force_newmap) 203 if (socket.current_map != ob->map || socket.force_newmap)
154 { 204 {
155 clear_map (pl); 205 clear_map (pl);
156 socket.current_map = ob->map; 206 socket.current_map = ob->map;
157 207 send_map_info (pl);
158 if (socket.mapinfocmd)
159 {
160 if (ob->map && ob->map->path[0])
161 {
162 int flags = 0;
163
164 if (ob->map->tile_path[0]) flags |= 1;
165 if (ob->map->tile_path[1]) flags |= 2;
166 if (ob->map->tile_path[2]) flags |= 4;
167 if (ob->map->tile_path[3]) flags |= 8;
168
169 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
170 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
171 ob->map->width, ob->map->height, &ob->map->path);
172 }
173 else
174 socket.send_packet ("mapinfo current");
175 }
176 } 208 }
177 else if (socket.current_x != ob->x || socket.current_y != ob->y) 209 else if (socket.current_x != ob->x || socket.current_y != ob->y)
178 { 210 {
179 int dx = ob->x - socket.current_x; 211 int dx = ob->x - socket.current_x;
180 int dy = ob->y - socket.current_y; 212 int dy = ob->y - socket.current_y;
181 213
182 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
183 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
184 else
185 {
186 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 214 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
187 socket.floorbox_reset (); 215 socket.floorbox_reset ();
188 }
189 } 216 }
190 217
191 socket.current_x = ob->x; 218 socket.current_x = ob->x;
192 socket.current_y = ob->y; 219 socket.current_y = ob->y;
193
194 region *reg = ob->region ();
195 if (socket.current_region != reg)
196 {
197 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
198 socket.current_region = reg;
199 }
200} 220}
201 221
202/** 222/**
203 * RequestInfo is sort of a meta command. There is some specific 223 * RequestInfo is sort of a meta command. There is some specific
204 * request of information, but we call other functions to provide 224 * request of information, but we call other functions to provide
… …
380AddMeCmd (char *buf, int len, client *ns) 400AddMeCmd (char *buf, int len, client *ns)
381{ 401{
382 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 402 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
383} 403}
384 404
385/** Reply to ExtendedInfos command */
386void
387ToggleExtendedInfos (char *buf, int len, client * ns)
388{
389 char cmdback[MAX_BUF];
390 char command[50];
391 int info, nextinfo;
392
393 cmdback[0] = '\0';
394 nextinfo = 0;
395
396 while (1)
397 {
398 /* 1. Extract an info */
399 info = nextinfo;
400
401 while ((info < len) && (buf[info] == ' '))
402 info++;
403
404 if (info >= len)
405 break;
406
407 nextinfo = info + 1;
408
409 while ((nextinfo < len) && (buf[nextinfo] != ' '))
410 nextinfo++;
411
412 if (nextinfo - info >= 49) /*Erroneous info asked */
413 continue;
414
415 strncpy (command, &(buf[info]), nextinfo - info);
416
417 /* 2. Interpret info */
418 if (!strcmp ("smooth", command))
419 /* Toggle smoothing */
420 ns->EMI_smooth = !ns->EMI_smooth;
421 else
422 /*bad value */;
423
424 /*3. Next info */
425 }
426
427 strcpy (cmdback, "ExtendedInfoSet");
428
429 if (ns->EMI_smooth)
430 {
431 strcat (cmdback, " ");
432 strcat (cmdback, "smoothing");
433 }
434
435 ns->send_packet (cmdback);
436}
437
438/* 405/*
439#define MSG_TYPE_BOOK 1 406#define MSG_TYPE_BOOK 1
440#define MSG_TYPE_CARD 2 407#define MSG_TYPE_CARD 2
441#define MSG_TYPE_PAPER 3 408#define MSG_TYPE_PAPER 3
442#define MSG_TYPE_SIGN 4 409#define MSG_TYPE_SIGN 4
… …
719 * Get player's current range attack in obuf. 686 * Get player's current range attack in obuf.
720 */ 687 */
721static void 688static void
722rangetostring (player *pl, char *obuf) 689rangetostring (player *pl, char *obuf)
723{ 690{
724 dynbuf_text buf; 691 dynbuf_text &buf = msg_dynbuf; buf.clear ();
725 692
726 if (pl->ranged_ob) 693 if (pl->ranged_ob)
727 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 694 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
728 695
729 if (pl->combat_ob) 696 if (pl->combat_ob)
… …
805 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 772 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
806 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 773 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
807 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 774 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
808 775
809 for (int s = 0; s < NUM_SKILLS; s++) 776 for (int s = 0; s < NUM_SKILLS; s++)
810 if (object *skill = opl->last_skill_ob[s]) 777 if (object *skill = opl->last_skill_ob [s])
811 if (skill->stats.exp != ns->last_skill_exp [s]) 778 if (skill->stats.exp != ns->last_skill_exp [s])
812 { 779 {
813 ns->last_skill_exp [s] = skill->stats.exp; 780 ns->last_skill_exp [s] = skill->stats.exp;
814 781
815 /* Always send along the level if exp changes. This is only 782 /* Always send along the level if exp changes. This is only
… …
884 << uint32 (pl->ob->face) 851 << uint32 (pl->ob->face)
885 << data8 (pl->ob->name); 852 << data8 (pl->ob->name);
886 853
887 pl->ns->last_weight = weight; 854 pl->ns->last_weight = weight;
888 pl->ns->send_packet (sl); 855 pl->ns->send_packet (sl);
889 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
890} 856}
891 857
892/****************************************************************************** 858/******************************************************************************
893 * 859 *
894 * Start of map related commands. 860 * Start of map related commands.
… …
961 927
962 /* Nothing changed */ 928 /* Nothing changed */
963 return 0; 929 return 0;
964} 930}
965 931
966/**
967 * Returns the size of a data for a map square as returned by
968 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
969 * available.
970 */
971int
972getExtendedMapInfoSize (client * ns)
973{
974 int result = 0;
975
976 if (ns->ext_mapinfos)
977 {
978 if (ns->EMI_smooth)
979 result += 1; /*One byte for smoothlevel */
980 }
981
982 return result;
983}
984
985// prefetch (and touch) all maps within a specific distancd 932// prefetch (and touch) all maps within a specific distancd
986static void 933static void
987prefetch_surrounding_maps (maptile *map, int distance) 934prefetch_surrounding_maps (maptile *map, int distance)
988{ 935{
989 map->last_access = runtime; 936 map->touch ();
990 937
991 if (--distance) 938 if (--distance)
992 for (int dir = 4; --dir; ) 939 for (int dir = 4; --dir; )
993 if (const shstr &path = map->tile_path [dir]) 940 if (const shstr &path = map->tile_path [dir])
994 if (maptile *&neigh = map->tile_map [dir]) 941 if (maptile *&neigh = map->tile_map [dir])
… …
1012{ 959{
1013 object *ob = pl->observe; 960 object *ob = pl->observe;
1014 if (!ob->active) 961 if (!ob->active)
1015 return; 962 return;
1016 963
1017 maptile *plmap = ob->map;
1018
1019 /* If player is just joining the game, he isn't here yet, so the map 964 /* If player is just joining the game, he isn't here yet, so the map
1020 * can get swapped out. If so, don't try to send them a map. All will 965 * can get swapped out. If so, don't try to send them a map. All will
1021 * be OK once they really log in. 966 * be OK once they really log in.
1022 */ 967 */
1023 if (!plmap || plmap->in_memory != MAP_ACTIVE) 968 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1024 return; 969 return;
1025 970
1026 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1027 int estartlen, eoldlen; 971 int startlen, oldlen;
1028 uint8 eentrysize;
1029 uint16 ewhatstart, ewhatflag;
1030 uint8 extendedinfos;
1031 972
1032 check_map_change (pl); 973 check_map_change (pl);
1033 prefetch_surrounding_maps (pl->ob); 974 prefetch_surrounding_maps (pl->ob);
1034 975
1035 /* do LOS after calls to update_position */ 976 /* do LOS after calls to update_position */
1036 if (ob != pl->ob) 977 /* unfortunately, we need to udpate los when observing, currently */
1037 clear_los (pl); 978 if (pl->do_los || pl->observe != pl->ob)
1038 else if (pl->do_los)
1039 { 979 {
1040 update_los (ob);
1041 pl->do_los = 0; 980 pl->do_los = 0;
981 pl->update_los ();
1042 } 982 }
1043 983
1044 /** 984 /**
1045 * This function uses the new map1 protocol command to send the map 985 * This function uses the new map1 protocol command to send the map
1046 * to the client. It is necessary because the old map command supports 986 * to the client. It is necessary because the old map command supports
… …
1065 */ 1005 */
1066 1006
1067 client &socket = *pl->ns; 1007 client &socket = *pl->ns;
1068 1008
1069 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1009 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1070 packet esl;
1071 1010
1072 startlen = sl.length (); 1011 startlen = sl.length ();
1073 1012
1074 /*Extendedmapinfo structure initialisation */ 1013 int hx = socket.mapx / 2;
1075 if (socket.ext_mapinfos) 1014 int hy = socket.mapy / 2;
1076 {
1077 extendedinfos = EMI_NOREDRAW;
1078 1015
1079 if (socket.EMI_smooth) 1016 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1080 extendedinfos |= EMI_SMOOTH; 1017 int ax = dx + hx;
1018 int ay = dy + hy;
1081 1019
1082 ewhatstart = esl.length (); 1020 int mask = (ax << 10) | (ay << 4);
1083 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1021 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1084 could need to be taken away */
1085 eentrysize = getExtendedMapInfoSize (&socket);
1086 esl << "mapextended "
1087 << uint8 (extendedinfos)
1088 << uint8 (eentrysize);
1089 1022
1090 estartlen = esl.length (); 1023 /* If the coordinates are not valid, or it is too dark to see,
1091 } 1024 * we tell the client as such
1092
1093 /* x,y are the real map locations. ax, ay are viewport relative
1094 * locations.
1095 */ 1025 */
1096 ay = 0; 1026 if (!m)
1097
1098 /* We could do this logic as conditionals in the if statement,
1099 * but that started to get a bit messy to look at.
1100 */
1101 max_x = ob->x + (socket.mapx + 1) / 2;
1102 max_y = ob->y + (socket.mapy + 1) / 2;
1103
1104 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1105 { 1027 {
1106 sint16 nx, ny; 1028 /* space is out of map. Update space and clear values
1107 maptile *m = 0; 1029 * if this hasn't already been done. If the space is out
1108 1030 * of the map, it shouldn't have a head.
1109 ax = 0; 1031 */
1110 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) 1032 if (lastcell.count != -1)
1111 { 1033 {
1112 // check to see if we can simply go one right quickly 1034 sl << uint16 (mask);
1035 map_clearcell (&lastcell, -1);
1113 ++nx; 1036 }
1114 if (m && nx >= m->width) 1037
1038 continue;
1039 }
1040
1041 int d = pl->blocked_los_uc (dx, dy);
1042
1043 if (d > 3)
1044 {
1045 /* This block deals with spaces that are not visible for whatever
1046 * reason. Still may need to send the head for this space.
1047 */
1048 if (lastcell.count != -1
1049 || lastcell.faces[0]
1050 || lastcell.faces[1]
1051 || lastcell.faces[2]
1052 || lastcell.stat_hp
1053 || lastcell.flags
1054 || lastcell.player)
1055 sl << uint16 (mask);
1056
1057 /* properly clear a previously sent big face */
1058 map_clearcell (&lastcell, -1);
1059 }
1060 else
1061 {
1062 /* In this block, the space is visible.
1063 */
1064
1065 /* Rather than try to figure out what everything that we might
1066 * need to send is, then form the packet after that,
1067 * we presume that we will in fact form a packet, and update
1068 * the bits by what we do actually send. If we send nothing,
1069 * we just back out sl.length () to the old value, and no harm
1070 * is done.
1071 * I think this is simpler than doing a bunch of checks to see
1072 * what if anything we need to send, setting the bits, then
1073 * doing those checks again to add the real data.
1074 */
1075 oldlen = sl.length ();
1076
1077 sl << uint16 (mask);
1078
1079 unsigned char dummy;
1080 unsigned char *last_ext = &dummy;
1081
1082 /* Darkness changed */
1083 if (lastcell.count != d)
1084 {
1115 m = 0; 1085 mask |= 0x8;
1116 1086
1117 if (!m) 1087 *last_ext |= 0x80;
1088 last_ext = &sl[sl.length ()];
1089 sl << uint8 (d);
1090 }
1091
1092 lastcell.count = d;
1093
1094 mapspace &ms = m->at (nx, ny);
1095 ms.update ();
1096
1097 // extmap handling
1098 uint8 stat_hp = 0;
1099 uint8 stat_width = 0;
1100 uint8 flags = 0;
1101 tag_t player = 0;
1102
1103 // send hp information, if applicable
1104 if (object *op = ms.faces_obj [0])
1105 if (op->is_head () && !op->invisible)
1118 { 1106 {
1119 nx = x; ny = y; m = plmap; 1107 if (op->stats.maxhp > op->stats.hp
1120 1108 && op->stats.maxhp > 0
1121 if (xy_normalise (m, nx, ny)) 1109 && (op->type == PLAYER
1122 m->touch (); 1110 || op->type == DOOR // does not work, have maxhp 0
1123 else 1111 || QUERY_FLAG (op, FLAG_MONSTER)
1112 || QUERY_FLAG (op, FLAG_ALIVE)
1113 || QUERY_FLAG (op, FLAG_GENERATOR)))
1124 m = 0; 1114 {
1115 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1116 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1117 }
1118
1119 if (expect_false (op->has_dialogue ()))
1120 flags |= 1;
1121
1122 if (expect_false (op->type == PLAYER))
1123 player = op == ob ? pl->ob->count
1124 : op == pl->ob ? ob->count
1125 : op->count;
1125 } 1126 }
1126 1127
1127 int emask, mask; 1128 if (expect_false (lastcell.stat_hp != stat_hp))
1128 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1129
1130 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1131
1132 /* If the coordinates are not valid, or it is too dark to see,
1133 * we tell the client as such
1134 */
1135 if (!m)
1136 { 1129 {
1137 /* space is out of map. Update space and clear values 1130 lastcell.stat_hp = stat_hp;
1138 * if this hasn't already been done. If the space is out 1131
1139 * of the map, it shouldn't have a head 1132 mask |= 0x8;
1140 */ 1133 *last_ext |= 0x80;
1141 if (lastcell.count != -1) 1134 last_ext = &sl[sl.length ()];
1135
1136 sl << uint8 (5) << uint8 (stat_hp);
1137
1138 if (stat_width > 1)
1142 { 1139 {
1143 sl << uint16 (mask);
1144 map_clearcell (&lastcell, -1);
1145 }
1146
1147 continue;
1148 }
1149
1150 int d = pl->blocked_los[ax][ay];
1151
1152 if (d > 3)
1153 {
1154
1155 int need_send = 0, count;
1156
1157 /* This block deals with spaces that are not visible for whatever
1158 * reason. Still may need to send the head for this space.
1159 */
1160
1161 oldlen = sl.length ();
1162
1163 sl << uint16 (mask);
1164
1165 if (lastcell.count != -1)
1166 need_send = 1;
1167
1168 count = -1;
1169
1170 /* properly clear a previously sent big face */
1171 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1172 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1173 need_send = 1;
1174
1175 map_clearcell (&lastcell, count);
1176
1177 if ((mask & 0xf) || need_send)
1178 sl[oldlen + 1] = mask & 0xff;
1179 else
1180 sl.reset (oldlen);
1181 }
1182 else
1183 {
1184 /* In this block, the space is visible.
1185 */
1186
1187 /* Rather than try to figure out what everything that we might
1188 * need to send is, then form the packet after that,
1189 * we presume that we will in fact form a packet, and update
1190 * the bits by what we do actually send. If we send nothing,
1191 * we just back out sl.length () to the old value, and no harm
1192 * is done.
1193 * I think this is simpler than doing a bunch of checks to see
1194 * what if anything we need to send, setting the bits, then
1195 * doing those checks again to add the real data.
1196 */
1197 oldlen = sl.length ();
1198 eoldlen = esl.length ();
1199
1200 sl << uint16 (mask);
1201
1202 unsigned char dummy;
1203 unsigned char *last_ext = &dummy;
1204
1205 /* Darkness changed */
1206 if (lastcell.count != d && socket.darkness)
1207 {
1208 mask |= 0x8;
1209
1210 if (socket.extmap)
1211 {
1212 *last_ext |= 0x80; 1140 *last_ext |= 0x80;
1213 last_ext = &sl[sl.length ()]; 1141 last_ext = &sl[sl.length ()];
1214 sl << uint8 (d); 1142
1215 } 1143 sl << uint8 (6) << uint8 (stat_width);
1216 else
1217 sl << uint8 (255 - 64 * d);
1218 } 1144 }
1145 }
1219 1146
1220 lastcell.count = d; 1147 if (expect_false (lastcell.player != player))
1221
1222 mapspace &ms = m->at (nx, ny);
1223 ms.update ();
1224
1225 if (socket.extmap)
1226 { 1148 {
1227 uint8 stat_hp = 0; 1149 lastcell.player = player;
1228 uint8 stat_width = 0;
1229 uint8 flags = 0;
1230 tag_t player = 0;
1231 1150
1232 // send hp information, if applicable
1233 if (object *op = ms.faces_obj [0])
1234 if (op->is_head () && !op->invisible)
1235 {
1236 if (op->stats.maxhp > op->stats.hp
1237 && op->stats.maxhp > 0
1238 && (op->type == PLAYER
1239 || op->type == DOOR // does not work, have maxhp 0
1240 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
1241 {
1242 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1243 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1244 }
1245
1246 if (op->msg && op->msg[0] == '@')
1247 flags |= 1;
1248
1249 if (op->type == PLAYER && op != ob)
1250 player = op->count;
1251 }
1252
1253 if (lastcell.stat_hp != stat_hp)
1254 {
1255 lastcell.stat_hp = stat_hp;
1256
1257 mask |= 0x8; 1151 mask |= 0x8;
1258 *last_ext |= 0x80; 1152 *last_ext |= 0x80;
1259 last_ext = &sl[sl.length ()]; 1153 last_ext = &sl[sl.length ()];
1260 1154
1261 sl << uint8 (5) << uint8 (stat_hp);
1262
1263 if (stat_width > 1)
1264 {
1265 *last_ext |= 0x80;
1266 last_ext = &sl[sl.length ()];
1267
1268 sl << uint8 (6) << uint8 (stat_width);
1269 }
1270 }
1271
1272 if (lastcell.player != player)
1273 {
1274 lastcell.player = player;
1275
1276 mask |= 0x8;
1277 *last_ext |= 0x80;
1278 last_ext = &sl[sl.length ()];
1279
1280 sl << uint8 (0x47) << uint8 (4) << (uint32)player; 1155 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1281 } 1156 }
1282 1157
1283 if (lastcell.flags != flags) 1158 if (expect_false (lastcell.flags != flags))
1284 { 1159 {
1285 lastcell.flags = flags; 1160 lastcell.flags = flags;
1286 1161
1287 mask |= 0x8; 1162 mask |= 0x8;
1288 *last_ext |= 0x80; 1163 *last_ext |= 0x80;
1289 last_ext = &sl[sl.length ()]; 1164 last_ext = &sl[sl.length ()];
1290 1165
1291 sl << uint8 (8) << uint8 (flags); 1166 sl << uint8 (8) << uint8 (flags);
1292 }
1293 } 1167 }
1294 1168
1169 // faces
1170
1295 /* Floor face */ 1171 /* Floor face */
1296 if (update_space (sl, socket, ms, lastcell, 2)) 1172 if (update_space (sl, socket, ms, lastcell, 2))
1297 mask |= 0x4; 1173 mask |= 0x4;
1298 1174
1299 /* Middle face */ 1175 /* Middle face */
1300 if (update_space (sl, socket, ms, lastcell, 1)) 1176 if (update_space (sl, socket, ms, lastcell, 1))
1301 mask |= 0x2; 1177 mask |= 0x2;
1302 1178
1179 if (expect_false (ob->invisible)
1180 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1303 if (ms.player () == ob 1181 && ms.player () == ob)
1304 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1305 { 1182 {
1306 // force player to be visible to himself if invisible 1183 // force player to be visible to himself if invisible
1307 if (lastcell.faces[0] != ob->face) 1184 if (lastcell.faces[0] != ob->face)
1308 { 1185 {
1309 lastcell.faces[0] = ob->face; 1186 lastcell.faces[0] = ob->face;
1310 1187
1311 mask |= 0x1;
1312 sl << uint16 (ob->face);
1313
1314 socket.send_faces (ob);
1315 }
1316 }
1317 /* Top face */
1318 else if (update_space (sl, socket, ms, lastcell, 0))
1319 mask |= 0x1; 1188 mask |= 0x1;
1189 sl << uint16 (ob->face);
1320 1190
1191 socket.send_faces (ob);
1192 }
1193 }
1194 /* Top face */
1195 else if (update_space (sl, socket, ms, lastcell, 0))
1196 mask |= 0x1;
1197
1321 /* Check to see if we are in fact sending anything for this 1198 /* Check to see if we are in fact sending anything for this
1322 * space by checking the mask. If so, update the mask. 1199 * space by checking the mask. If so, update the mask.
1323 * if not, reset the len to that from before adding the mask 1200 * if not, reset the len to that from before adding the mask
1324 * value, so we don't send those bits. 1201 * value, so we don't send those bits.
1325 */ 1202 */
1326 if (mask & 0xf) 1203 if (mask & 0xf)
1327 sl[oldlen + 1] = mask & 0xff; 1204 sl[oldlen + 1] = mask & 0xff;
1328 else 1205 else
1329 sl.reset (oldlen); 1206 sl.reset (oldlen);
1330
1331 if (socket.ext_mapinfos)
1332 esl << uint16 (emask);
1333
1334 if (socket.EMI_smooth)
1335 {
1336 for (int layer = 2+1; layer--; )
1337 {
1338 object *ob = ms.faces_obj [layer];
1339
1340 // If there is no object for this space, or if the face for the object
1341 // is the blank face, set the smoothlevel to zero.
1342 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1343
1344 // We've gotten what face we want to use for the object. Now see if
1345 // if it has changed since we last sent it to the client.
1346 if (lastcell.smooth[layer] != smoothlevel)
1347 {
1348 lastcell.smooth[layer] = smoothlevel;
1349 esl << uint8 (smoothlevel);
1350 emask |= 1 << layer;
1351 }
1352 }
1353
1354 if (emask & 0xf)
1355 esl[eoldlen + 1] = emask & 0xff;
1356 else
1357 esl.reset (eoldlen);
1358 }
1359 } /* else this is a viewable space */ 1207 } /* else this is a viewable space */
1360 } /* for x loop */ 1208 ordered_mapwalk_end
1361 } /* for y loop */
1362 1209
1363 socket.flush_fx (); 1210 socket.flush_fx ();
1364
1365 /* Verify that we in fact do need to send this */
1366 if (socket.ext_mapinfos)
1367 {
1368 if (!(sl.length () > startlen || socket.sent_scroll))
1369 {
1370 /* No map data will follow, so don't say the client
1371 * it doesn't need draw!
1372 */
1373 ewhatflag &= ~EMI_NOREDRAW;
1374 esl[ewhatstart + 1] = ewhatflag & 0xff;
1375 }
1376
1377 if (esl.length () > estartlen)
1378 socket.send_packet (esl);
1379 }
1380 1211
1381 if (sl.length () > startlen || socket.sent_scroll) 1212 if (sl.length () > startlen || socket.sent_scroll)
1382 { 1213 {
1383 socket.send_packet (sl); 1214 socket.send_packet (sl);
1384 socket.sent_scroll = 0; 1215 socket.sent_scroll = 0;
… …
1405{ 1236{
1406 packet sl; 1237 packet sl;
1407 sl << "replyinfo skill_info\n"; 1238 sl << "replyinfo skill_info\n";
1408 1239
1409 for (int i = 1; i < NUM_SKILLS; i++) 1240 for (int i = 1; i < NUM_SKILLS; i++)
1410 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1241 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1411 1242
1412 if (sl.length () > MAXSOCKBUF) 1243 if (sl.length () > MAXSOCKBUF)
1413 { 1244 {
1414 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1245 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1415 fatal (0); 1246 fatal (0);
… …
1459 if (spell->type == SPELL) 1290 if (spell->type == SPELL)
1460 { 1291 {
1461 int flags = 0; 1292 int flags = 0;
1462 1293
1463 /* check if we need to update it */ 1294 /* check if we need to update it */
1464 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1295 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1465 { 1296 {
1466 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1297 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1467 flags |= UPD_SP_MANA; 1298 flags |= UPD_SP_MANA;
1468 } 1299 }
1469 1300
1470 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1301 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1471 { 1302 {
1472 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1303 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1473 flags |= UPD_SP_GRACE; 1304 flags |= UPD_SP_GRACE;
1474 } 1305 }
1475 1306
1476 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1307 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1477 { 1308 {
1478 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1309 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1479 flags |= UPD_SP_DAMAGE; 1310 flags |= UPD_SP_DAMAGE;
1480 } 1311 }
1481 1312
1482 if (flags) 1313 if (flags)
1483 { 1314 {
… …
1485 1316
1486 sl << "updspell " 1317 sl << "updspell "
1487 << uint8 (flags) 1318 << uint8 (flags)
1488 << uint32 (spell->count); 1319 << uint32 (spell->count);
1489 1320
1490 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1321 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1491 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1322 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1492 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1323 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1493 1324
1494 pl->ns->send_packet (sl); 1325 pl->ns->send_packet (sl);
1495 } 1326 }
1496 } 1327 }
1497 } 1328 }
… …
1527 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1358 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1528 return; 1359 return;
1529 } 1360 }
1530 1361
1531 /* store costs and damage in the object struct, to compare to later */ 1362 /* store costs and damage in the object struct, to compare to later */
1532 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1363 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1533 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1364 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1534 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1365 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1535 1366
1536 /* figure out which skill it uses, if it uses one */ 1367 /* figure out which skill it uses, if it uses one */
1537 if (spell->skill) 1368 if (spell->skill)
1538 { 1369 if (object *tmp = pl->find_skill (spell->skill))
1539 for (i = 1; i < NUM_SKILLS; i++)
1540 if (!strcmp (spell->skill, skill_names[i]))
1541 {
1542 skill = i + CS_STAT_SKILLINFO; 1370 skill = tmp->subtype + CS_STAT_SKILLINFO;
1543 break;
1544 }
1545 }
1546 1371
1547 // spells better have a face 1372 // spells better have a face
1548 if (!spell->face) 1373 if (!spell->face)
1549 { 1374 {
1550 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1375 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
… …
1555 1380
1556 /* send the current values */ 1381 /* send the current values */
1557 sl << uint32 (spell->count) 1382 sl << uint32 (spell->count)
1558 << uint16 (spell->level) 1383 << uint16 (spell->level)
1559 << uint16 (spell->casting_time) 1384 << uint16 (spell->casting_time)
1560 << uint16 (spell->last_sp) 1385 << uint16 (spell->cached_sp)
1561 << uint16 (spell->last_grace) 1386 << uint16 (spell->cached_grace)
1562 << uint16 (spell->last_eat) 1387 << uint16 (spell->cached_eat)
1563 << uint8 (skill) 1388 << uint8 (skill)
1564 << uint32 (spell->path_attuned) 1389 << uint32 (spell->path_attuned)
1565 << uint32 (spell->face) 1390 << uint32 (spell->face)
1566 << data8 (spell->name) 1391 << data8 (spell->name)
1567 << data16 (spell->msg); 1392 << data16 (spell->msg);

Diff Legend

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