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.119 by root, Fri Aug 24 00:26:10 2007 UTC vs.
Revision 1.144 by root, Fri Dec 26 10:36:42 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * 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
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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,
… …
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 GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24/** 24/**
25 * \file 25 * \file
26 * Client handling. 26 * Client handling.
… …
98 */ 98 */
99 mx = ns->mapx; 99 mx = ns->mapx;
100 my = ns->mapy; 100 my = ns->mapy;
101 101
102 /* the x and y here are coordinates for the new map, i.e. if we moved 102 /* 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, 103 * (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 104 * if the destination x or y coordinate is outside the viewable
105 * area, we clear the values - otherwise, the old values 105 * area, we clear the values - otherwise, the old values
106 * are preserved, and the check_head thinks it needs to clear them. 106 * are preserved, and the check_head thinks it needs to clear them.
107 */ 107 */
108 for (x = 0; x < mx; x++) 108 for (x = 0; x < mx; x++)
109 {
110 for (y = 0; y < my; y++) 109 for (y = 0; y < my; y++)
111 {
112 if (x >= ns->mapx || y >= ns->mapy) 110 if (x >= ns->mapx || y >= ns->mapy)
113 /* clear cells outside the viewable area */ 111 /* clear cells outside the viewable area */
114 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 112 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) 113 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 */ 114 /* clear newly visible tiles within the viewable area */
117 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 115 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
118 else 116 else
119 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 117 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
120 }
121 }
122 118
123 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 119 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
124 120
125 /* Make sure that the next "map1" command will be sent (even if it is 121 /* Make sure that the next "map1" command will be sent (even if it is
126 * empty). 122 * empty).
… …
141 pl->ns->send_packet ("newmap"); 137 pl->ns->send_packet ("newmap");
142 138
143 pl->ns->floorbox_reset (); 139 pl->ns->floorbox_reset ();
144} 140}
145 141
142static void
143send_map_info (player *pl)
144{
145 client &socket = *pl->ns;
146 object *ob = pl->observe;
147
148 if (socket.mapinfocmd)
149 {
150 if (ob->map && ob->map->path[0])
151 {
152 int flags = 0;
153
154 if (ob->map->tile_path[0]) flags |= 1;
155 if (ob->map->tile_path[1]) flags |= 2;
156 if (ob->map->tile_path[2]) flags |= 4;
157 if (ob->map->tile_path[3]) flags |= 8;
158
159 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
160 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
161 ob->map->width, ob->map->height, &ob->map->path);
162 }
163 else
164 socket.send_packet ("mapinfo current");
165 }
166}
167
146/** check for map/region change and send new map data */ 168/** check for map/region change and send new map data */
147static void 169static void
148check_map_change (player *pl) 170check_map_change (player *pl)
149{ 171{
150 client &socket = *pl->ns; 172 client &socket = *pl->ns;
151 object *ob = pl->observe; 173 object *ob = pl->observe;
152 174
175 region *reg = ob->region ();
176 if (socket.current_region != reg)
177 {
178 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
179 socket.current_region = reg;
180 }
181
182 // first try to aovid a full newmap on tiled map scrolls
183 if (socket.current_map != ob->map && !socket.force_newmap)
184 {
185 rv_vector rv;
186
187 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
188
189 // manhattan distance is very handy here
190 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
191 {
192 socket.current_map = ob->map;
193 socket.current_x = ob->x;
194 socket.current_y = ob->y;
195
196 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
197 socket.floorbox_reset ();
198 send_map_info (pl);
199 }
200 }
201
153 if (socket.current_map != ob->map || socket.force_newmap) 202 if (socket.current_map != ob->map || socket.force_newmap)
154 { 203 {
155 clear_map (pl); 204 clear_map (pl);
156 socket.current_map = ob->map; 205 socket.current_map = ob->map;
157 206 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 } 207 }
177 else if (socket.current_x != ob->x || socket.current_y != ob->y) 208 else if (socket.current_x != ob->x || socket.current_y != ob->y)
178 { 209 {
179 int dx = ob->x - socket.current_x; 210 int dx = ob->x - socket.current_x;
180 int dy = ob->y - socket.current_y; 211 int dy = ob->y - socket.current_y;
… …
188 } 219 }
189 } 220 }
190 221
191 socket.current_x = ob->x; 222 socket.current_x = ob->x;
192 socket.current_y = ob->y; 223 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} 224}
201 225
202/** 226/**
203 * RequestInfo is sort of a meta command. There is some specific 227 * RequestInfo is sort of a meta command. There is some specific
204 * request of information, but we call other functions to provide 228 * request of information, but we call other functions to provide
… …
263{ 287{
264 char *token = buf; 288 char *token = buf;
265 buf += strlen (buf) + 9; 289 buf += strlen (buf) + 9;
266 290
267 // initial map and its origin 291 // initial map and its origin
268 maptile *map = pl->ob->map; 292 maptile *map = pl->observe->map;
269 int mapx = pl->ns->mapx / 2 - pl->ob->x; 293 int mapx = pl->ns->mapx / 2 - pl->observe->x;
270 int mapy = pl->ns->mapy / 2 - pl->ob->y; 294 int mapy = pl->ns->mapy / 2 - pl->observe->y;
271 int max_distance = 8; // limit maximum path length to something generous 295 int max_distance = 8; // limit maximum path length to something generous
272 296
273 while (*buf && map && max_distance) 297 while (*buf && map && max_distance)
274 { 298 {
275 int dir = *buf++ - '1'; 299 int dir = *buf++ - '1';
276 300
277 if (dir >= 0 && dir <= 3) 301 if (dir >= 0 && dir <= 3)
278 { 302 {
279 if (!map->tile_path [dir]) 303 if (!map->tile_path [dir])
280 map = 0; 304 map = 0;
281 else if (map->tile_available (dir)) 305 else if (map->tile_available (dir, false))
282 { 306 {
283 maptile *neigh = map->tile_map [dir]; 307 maptile *neigh = map->tile_map [dir];
284 308
285 switch (dir) 309 switch (dir)
286 { 310 {
… …
300 max_distance = 0; 324 max_distance = 0;
301 } 325 }
302 326
303 if (!max_distance) 327 if (!max_distance)
304 send_packet_printf ("mapinfo %s error", token); 328 send_packet_printf ("mapinfo %s error", token);
305 else if (!map || !map->path[0]) 329 else if (!map || !map->path)
306 send_packet_printf ("mapinfo %s nomap", token); 330 send_packet_printf ("mapinfo %s nomap", token);
307 else 331 else
308 { 332 {
309 int flags = 0; 333 int flags = 0;
310 334
… …
686 * syntax is: move (to) (tag) (nrof) 710 * syntax is: move (to) (tag) (nrof)
687 */ 711 */
688void 712void
689MoveCmd (char *buf, int len, player *pl) 713MoveCmd (char *buf, int len, player *pl)
690{ 714{
691 int vals[3], i; 715 int to, tag, nrof;
692 716
693 /* A little funky here. We only cycle for 2 records, because 717 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
694 * we obviously are not going to find a space after the third
695 * record. Perhaps we should just replace this with a
696 * sscanf?
697 */
698 for (i = 0; i < 2; i++)
699 { 718 {
700 vals[i] = atoi (buf);
701
702 if (!(buf = strchr (buf, ' ')))
703 {
704 LOG (llevError, "Incomplete move command: %s\n", buf); 719 LOG (llevError, "Incomplete move command: %s\n", buf);
705 return; 720 return;
706 }
707
708 buf++;
709 } 721 }
710 722
711 vals[2] = atoi (buf); 723 esrv_move_object (pl->ob, to, tag, nrof);
712
713/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
714 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
715} 724}
716 725
717/****************************************************************************** 726/******************************************************************************
718 * 727 *
719 * Start of commands the server sends to the client. 728 * Start of commands the server sends to the client.
… …
820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 829 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 830 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 831 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
823 832
824 for (int s = 0; s < NUM_SKILLS; s++) 833 for (int s = 0; s < NUM_SKILLS; s++)
825 if (object *skill = opl->last_skill_ob[s]) 834 if (object *skill = opl->last_skill_ob [s])
826 if (skill->stats.exp != ns->last_skill_exp [s]) 835 if (skill->stats.exp != ns->last_skill_exp [s])
827 { 836 {
828 ns->last_skill_exp [s] = skill->stats.exp; 837 ns->last_skill_exp [s] = skill->stats.exp;
829 838
830 /* Always send along the level if exp changes. This is only 839 /* Always send along the level if exp changes. This is only
… …
886 895
887/** 896/**
888 * Tells the client that here is a player it should start using. 897 * Tells the client that here is a player it should start using.
889 */ 898 */
890void 899void
891esrv_new_player (player *pl, uint32 weight) 900esrv_new_player (player *pl)
892{ 901{
902 sint32 weight = pl->ob->client_weight ();
903
893 packet sl ("player"); 904 packet sl ("player");
894 905
895 sl << uint32 (pl->ob->count) 906 sl << uint32 (pl->ob->count)
896 << uint32 (weight) 907 << uint32 (weight)
897 << uint32 (pl->ob->face) 908 << uint32 (pl->ob->face)
898 << data8 (pl->ob->name); 909 << data8 (pl->ob->name);
899 910
900 pl->ns->last_weight = weight; 911 pl->ns->last_weight = weight;
901 pl->ns->send_packet (sl); 912 pl->ns->send_packet (sl);
902 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
903} 913}
904 914
905/****************************************************************************** 915/******************************************************************************
906 * 916 *
907 * Start of map related commands. 917 * Start of map related commands.
… …
1025{ 1035{
1026 object *ob = pl->observe; 1036 object *ob = pl->observe;
1027 if (!ob->active) 1037 if (!ob->active)
1028 return; 1038 return;
1029 1039
1030 maptile *plmap = ob->map;
1031
1032 /* If player is just joining the game, he isn't here yet, so the map 1040 /* If player is just joining the game, he isn't here yet, so the map
1033 * can get swapped out. If so, don't try to send them a map. All will 1041 * can get swapped out. If so, don't try to send them a map. All will
1034 * be OK once they really log in. 1042 * be OK once they really log in.
1035 */ 1043 */
1036 if (!plmap || plmap->in_memory != MAP_IN_MEMORY) 1044 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1037 return; 1045 return;
1038 1046
1039 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1047 int startlen, oldlen;
1040 int estartlen, eoldlen; 1048 int estartlen, eoldlen;
1041 uint8 eentrysize; 1049 uint8 eentrysize;
1042 uint16 ewhatstart, ewhatflag; 1050 uint16 ewhatstart, ewhatflag;
1043 uint8 extendedinfos; 1051 uint8 extendedinfos;
1044 1052
1045 check_map_change (pl); 1053 check_map_change (pl);
1046 prefetch_surrounding_maps (pl->ob); 1054 prefetch_surrounding_maps (pl->ob);
1047 1055
1048 /* do LOS after calls to update_position */ 1056 /* do LOS after calls to update_position */
1049 if (ob != pl->ob) 1057 /* unfortunately, we need to udpate los when observing, currently */
1050 clear_los (pl); 1058 if (pl->do_los || pl->observe != pl->ob)
1051 else if (pl->do_los)
1052 { 1059 {
1053 update_los (ob);
1054 pl->do_los = 0; 1060 pl->do_los = 0;
1061 pl->update_los ();
1055 } 1062 }
1056 1063
1057 /** 1064 /**
1058 * This function uses the new map1 protocol command to send the map 1065 * This function uses the new map1 protocol command to send the map
1059 * to the client. It is necessary because the old map command supports 1066 * to the client. It is necessary because the old map command supports
… …
1101 << uint8 (eentrysize); 1108 << uint8 (eentrysize);
1102 1109
1103 estartlen = esl.length (); 1110 estartlen = esl.length ();
1104 } 1111 }
1105 1112
1106 /* x,y are the real map locations. ax, ay are viewport relative 1113 int hx = socket.mapx / 2;
1107 * locations. 1114 int hy = socket.mapy / 2;
1108 */
1109 ay = 0;
1110 1115
1111 /* We could do this logic as conditionals in the if statement, 1116 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1112 * but that started to get a bit messy to look at. 1117 int ax = dx + hx;
1113 */ 1118 int ay = dy + hy;
1114 max_x = ob->x + (socket.mapx + 1) / 2;
1115 max_y = ob->y + (socket.mapy + 1) / 2;
1116 1119
1117 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1118 {
1119 sint16 nx, ny;
1120 maptile *m = 0;
1121
1122 ax = 0;
1123 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1124 {
1125 // check to see if we can simply go one right quickly
1126 ++nx;
1127 if (m && nx >= m->width)
1128 m = 0;
1129
1130 if (!m)
1131 {
1132 nx = x; ny = y; m = plmap;
1133
1134 if (!xy_normalise (m, nx, ny))
1135 m = 0;
1136 }
1137
1138 int emask, mask; 1120 int emask, mask;
1139 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1121 emask = mask = (ax << 10) | (ay << 4);
1140 1122
1141 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1123 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1142 1124
1143 /* If the coordinates are not valid, or it is too dark to see, 1125 /* If the coordinates are not valid, or it is too dark to see,
1144 * we tell the client as such 1126 * we tell the client as such
1145 */ 1127 */
1146 if (!m) 1128 if (!m)
1147 { 1129 {
1148 /* space is out of map. Update space and clear values 1130 /* space is out of map. Update space and clear values
1149 * if this hasn't already been done. If the space is out 1131 * if this hasn't already been done. If the space is out
1150 * of the map, it shouldn't have a head 1132 * of the map, it shouldn't have a head.
1151 */ 1133 */
1152 if (lastcell.count != -1) 1134 if (lastcell.count != -1)
1135 {
1136 sl << uint16 (mask);
1137 map_clearcell (&lastcell, -1);
1138 }
1139
1140 continue;
1141 }
1142
1143 int d = pl->blocked_los_uc (dx, dy);
1144
1145 if (d > 3)
1146 {
1147 /* This block deals with spaces that are not visible for whatever
1148 * reason. Still may need to send the head for this space.
1149 */
1150 if (lastcell.count != -1
1151 || lastcell.faces[0]
1152 || lastcell.faces[1]
1153 || lastcell.faces[2]
1154 || lastcell.stat_hp
1155 || lastcell.flags
1156 || lastcell.player)
1157 sl << uint16 (mask);
1158
1159 /* properly clear a previously sent big face */
1160 map_clearcell (&lastcell, -1);
1161 }
1162 else
1163 {
1164 /* In this block, the space is visible.
1165 */
1166
1167 /* Rather than try to figure out what everything that we might
1168 * need to send is, then form the packet after that,
1169 * we presume that we will in fact form a packet, and update
1170 * the bits by what we do actually send. If we send nothing,
1171 * we just back out sl.length () to the old value, and no harm
1172 * is done.
1173 * I think this is simpler than doing a bunch of checks to see
1174 * what if anything we need to send, setting the bits, then
1175 * doing those checks again to add the real data.
1176 */
1177 oldlen = sl.length ();
1178 eoldlen = esl.length ();
1179
1180 sl << uint16 (mask);
1181
1182 unsigned char dummy;
1183 unsigned char *last_ext = &dummy;
1184
1185 /* Darkness changed */
1186 if (lastcell.count != d && socket.darkness)
1187 {
1188 mask |= 0x8;
1189
1190 if (socket.extmap)
1191 {
1192 *last_ext |= 0x80;
1193 last_ext = &sl[sl.length ()];
1194 sl << uint8 (d);
1195 }
1196 else
1197 sl << uint8 (255 - 64 * d);
1198 }
1199
1200 lastcell.count = d;
1201
1202 mapspace &ms = m->at (nx, ny);
1203 ms.update ();
1204
1205 if (expect_true (socket.extmap))
1206 {
1207 uint8 stat_hp = 0;
1208 uint8 stat_width = 0;
1209 uint8 flags = 0;
1210 tag_t player = 0;
1211
1212 // send hp information, if applicable
1213 if (object *op = ms.faces_obj [0])
1214 if (op->is_head () && !op->invisible)
1153 { 1215 {
1154 sl << uint16 (mask); 1216 if (op->stats.maxhp > op->stats.hp
1155 map_clearcell (&lastcell, -1); 1217 && op->stats.maxhp > 0
1218 && (op->type == PLAYER
1219 || op->type == DOOR // does not work, have maxhp 0
1220 || QUERY_FLAG (op, FLAG_MONSTER)
1221 || QUERY_FLAG (op, FLAG_ALIVE)
1222 || QUERY_FLAG (op, FLAG_GENERATOR)))
1223 {
1224 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1225 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1226 }
1227
1228 if (expect_false (op->has_dialogue ()))
1229 flags |= 1;
1230
1231 if (expect_false (op->type == PLAYER))
1232 player = op == ob ? pl->ob->count
1233 : op == pl->ob ? ob->count
1234 : op->count;
1156 } 1235 }
1157 1236
1158 continue; 1237 if (expect_false (lastcell.stat_hp != stat_hp))
1159 }
1160
1161 m->touch ();
1162
1163 int d = pl->blocked_los[ax][ay];
1164
1165 if (d > 3)
1166 {
1167
1168 int need_send = 0, count;
1169
1170 /* This block deals with spaces that are not visible for whatever
1171 * reason. Still may need to send the head for this space.
1172 */
1173
1174 oldlen = sl.length ();
1175
1176 sl << uint16 (mask);
1177
1178 if (lastcell.count != -1)
1179 need_send = 1;
1180
1181 count = -1;
1182
1183 /* properly clear a previously sent big face */
1184 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1185 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1186 need_send = 1;
1187
1188 map_clearcell (&lastcell, count);
1189
1190 if ((mask & 0xf) || need_send)
1191 sl[oldlen + 1] = mask & 0xff;
1192 else
1193 sl.reset (oldlen);
1194 }
1195 else
1196 {
1197 /* In this block, the space is visible.
1198 */
1199
1200 /* Rather than try to figure out what everything that we might
1201 * need to send is, then form the packet after that,
1202 * we presume that we will in fact form a packet, and update
1203 * the bits by what we do actually send. If we send nothing,
1204 * we just back out sl.length () to the old value, and no harm
1205 * is done.
1206 * I think this is simpler than doing a bunch of checks to see
1207 * what if anything we need to send, setting the bits, then
1208 * doing those checks again to add the real data.
1209 */
1210 oldlen = sl.length ();
1211 eoldlen = esl.length ();
1212
1213 sl << uint16 (mask);
1214
1215 unsigned char dummy;
1216 unsigned char *last_ext = &dummy;
1217
1218 /* Darkness changed */
1219 if (lastcell.count != d && socket.darkness)
1220 { 1238 {
1239 lastcell.stat_hp = stat_hp;
1240
1221 mask |= 0x8; 1241 mask |= 0x8;
1242 *last_ext |= 0x80;
1243 last_ext = &sl[sl.length ()];
1222 1244
1223 if (socket.extmap) 1245 sl << uint8 (5) << uint8 (stat_hp);
1246
1247 if (stat_width > 1)
1224 { 1248 {
1225 *last_ext |= 0x80; 1249 *last_ext |= 0x80;
1226 last_ext = &sl[sl.length ()]; 1250 last_ext = &sl[sl.length ()];
1227 sl << uint8 (d);
1228 }
1229 else
1230 sl << uint8 (255 - 64 * d);
1231 }
1232 1251
1233 lastcell.count = d;
1234
1235 mapspace &ms = m->at (nx, ny);
1236 ms.update ();
1237
1238 if (socket.extmap)
1239 {
1240 uint8 stat_hp = 0;
1241 uint8 stat_width = 0;
1242 uint8 flags = 0;
1243 tag_t player = 0;
1244
1245 // send hp information, if applicable
1246 if (object *op = ms.faces_obj [0])
1247 {
1248 if (op->head || op->invisible)
1249 ; // do not show
1250 else if (op->type == PLAYER
1251 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1252 {
1253 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1254 {
1255 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1256 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1257 }
1258 }
1259
1260 if (op->msg && op->msg[0] == '@')
1261 flags |= 1;
1262
1263 if (op->type == PLAYER && op != ob)
1264 player = op->count;
1265 }
1266
1267 if (lastcell.stat_hp != stat_hp)
1268 {
1269 lastcell.stat_hp = stat_hp;
1270
1271 mask |= 0x8;
1272 *last_ext |= 0x80;
1273 last_ext = &sl[sl.length ()];
1274
1275 sl << uint8 (5) << uint8 (stat_hp);
1276
1277 if (stat_width > 1)
1278 {
1279 *last_ext |= 0x80;
1280 last_ext = &sl[sl.length ()];
1281
1282 sl << uint8 (6) << uint8 (stat_width); 1252 sl << uint8 (6) << uint8 (stat_width);
1283 }
1284 } 1253 }
1285
1286 if (lastcell.player != player)
1287 {
1288 lastcell.player = player;
1289
1290 mask |= 0x8;
1291 *last_ext |= 0x80;
1292 last_ext = &sl[sl.length ()];
1293
1294 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1295 }
1296
1297 if (lastcell.flags != flags)
1298 {
1299 lastcell.flags = flags;
1300
1301 mask |= 0x8;
1302 *last_ext |= 0x80;
1303 last_ext = &sl[sl.length ()];
1304
1305 sl << uint8 (8) << uint8 (flags);
1306 }
1307 } 1254 }
1308 1255
1309 /* Floor face */ 1256 if (expect_false (lastcell.player != player))
1310 if (update_space (sl, socket, ms, lastcell, 2)) 1257 {
1258 lastcell.player = player;
1259
1311 mask |= 0x4; 1260 mask |= 0x8;
1261 *last_ext |= 0x80;
1262 last_ext = &sl[sl.length ()];
1312 1263
1313 /* Middle face */ 1264 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1314 if (update_space (sl, socket, ms, lastcell, 1)) 1265 }
1266
1267 if (expect_false (lastcell.flags != flags))
1268 {
1269 lastcell.flags = flags;
1270
1315 mask |= 0x2; 1271 mask |= 0x8;
1272 *last_ext |= 0x80;
1273 last_ext = &sl[sl.length ()];
1316 1274
1317 if (ms.player () == ob 1275 sl << uint8 (8) << uint8 (flags);
1318 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1319 { 1276 }
1277 }
1278
1279 /* Floor face */
1280 if (update_space (sl, socket, ms, lastcell, 2))
1281 mask |= 0x4;
1282
1283 /* Middle face */
1284 if (update_space (sl, socket, ms, lastcell, 1))
1285 mask |= 0x2;
1286
1287 if (expect_false (ob->invisible)
1288 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1289 && ms.player () == ob)
1290 {
1320 // force player to be visible to himself if invisible 1291 // force player to be visible to himself if invisible
1321 if (lastcell.faces[0] != ob->face) 1292 if (lastcell.faces[0] != ob->face)
1322 { 1293 {
1323 lastcell.faces[0] = ob->face; 1294 lastcell.faces[0] = ob->face;
1324 1295
1325 mask |= 0x1;
1326 sl << uint16 (ob->face);
1327
1328 socket.send_faces (ob);
1329 }
1330 }
1331 /* Top face */
1332 else if (update_space (sl, socket, ms, lastcell, 0))
1333 mask |= 0x1; 1296 mask |= 0x1;
1297 sl << uint16 (ob->face);
1334 1298
1299 socket.send_faces (ob);
1300 }
1301 }
1302 /* Top face */
1303 else if (update_space (sl, socket, ms, lastcell, 0))
1304 mask |= 0x1;
1305
1335 /* Check to see if we are in fact sending anything for this 1306 /* Check to see if we are in fact sending anything for this
1336 * space by checking the mask. If so, update the mask. 1307 * space by checking the mask. If so, update the mask.
1337 * if not, reset the len to that from before adding the mask 1308 * if not, reset the len to that from before adding the mask
1338 * value, so we don't send those bits. 1309 * value, so we don't send those bits.
1339 */ 1310 */
1340 if (mask & 0xf) 1311 if (mask & 0xf)
1341 sl[oldlen + 1] = mask & 0xff; 1312 sl[oldlen + 1] = mask & 0xff;
1342 else 1313 else
1343 sl.reset (oldlen); 1314 sl.reset (oldlen);
1344 1315
1345 if (socket.ext_mapinfos) 1316 if (socket.ext_mapinfos)
1346 esl << uint16 (emask); 1317 esl << uint16 (emask);
1347 1318
1348 if (socket.EMI_smooth) 1319 if (socket.EMI_smooth)
1320 {
1321 for (int layer = 2+1; layer--; )
1349 { 1322 {
1350 for (int layer = 2+1; layer--; )
1351 {
1352 object *ob = ms.faces_obj [layer]; 1323 object *ob = ms.faces_obj [layer];
1353 1324
1354 // If there is no object for this space, or if the face for the object 1325 // If there is no object for this space, or if the face for the object
1355 // is the blank face, set the smoothlevel to zero. 1326 // is the blank face, set the smoothlevel to zero.
1356 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0; 1327 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1357 1328
1358 // We've gotten what face we want to use for the object. Now see if 1329 // We've gotten what face we want to use for the object. Now see if
1359 // if it has changed since we last sent it to the client. 1330 // if it has changed since we last sent it to the client.
1360 if (lastcell.smooth[layer] != smoothlevel) 1331 if (lastcell.smooth[layer] != smoothlevel)
1361 { 1332 {
1362 lastcell.smooth[layer] = smoothlevel; 1333 lastcell.smooth[layer] = smoothlevel;
1363 esl << uint8 (smoothlevel); 1334 esl << uint8 (smoothlevel);
1364 emask |= 1 << layer; 1335 emask |= 1 << layer;
1365 }
1366 } 1336 }
1337 }
1367 1338
1368 if (emask & 0xf) 1339 if (emask & 0xf)
1369 esl[eoldlen + 1] = emask & 0xff; 1340 esl[eoldlen + 1] = emask & 0xff;
1370 else 1341 else
1371 esl.reset (eoldlen); 1342 esl.reset (eoldlen);
1372 } 1343 }
1373 } /* else this is a viewable space */ 1344 } /* else this is a viewable space */
1374 } /* for x loop */ 1345 ordered_mapwalk_end
1375 } /* for y loop */
1376 1346
1377 socket.flush_fx (); 1347 socket.flush_fx ();
1378 1348
1379 /* Verify that we in fact do need to send this */ 1349 /* Verify that we in fact do need to send this */
1380 if (socket.ext_mapinfos) 1350 if (socket.ext_mapinfos)
… …
1419{ 1389{
1420 packet sl; 1390 packet sl;
1421 sl << "replyinfo skill_info\n"; 1391 sl << "replyinfo skill_info\n";
1422 1392
1423 for (int i = 1; i < NUM_SKILLS; i++) 1393 for (int i = 1; i < NUM_SKILLS; i++)
1424 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1394 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1425 1395
1426 if (sl.length () > MAXSOCKBUF) 1396 if (sl.length () > MAXSOCKBUF)
1427 { 1397 {
1428 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1398 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1429 fatal (0); 1399 fatal (0);
… …
1473 if (spell->type == SPELL) 1443 if (spell->type == SPELL)
1474 { 1444 {
1475 int flags = 0; 1445 int flags = 0;
1476 1446
1477 /* check if we need to update it */ 1447 /* check if we need to update it */
1478 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1448 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1479 { 1449 {
1480 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1450 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1481 flags |= UPD_SP_MANA; 1451 flags |= UPD_SP_MANA;
1482 } 1452 }
1483 1453
1484 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1454 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1485 { 1455 {
1486 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1456 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1487 flags |= UPD_SP_GRACE; 1457 flags |= UPD_SP_GRACE;
1488 } 1458 }
1489 1459
1490 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1460 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1491 { 1461 {
1492 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1462 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1493 flags |= UPD_SP_DAMAGE; 1463 flags |= UPD_SP_DAMAGE;
1494 } 1464 }
1495 1465
1496 if (flags) 1466 if (flags)
1497 { 1467 {
… …
1499 1469
1500 sl << "updspell " 1470 sl << "updspell "
1501 << uint8 (flags) 1471 << uint8 (flags)
1502 << uint32 (spell->count); 1472 << uint32 (spell->count);
1503 1473
1504 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1474 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1505 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1475 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1506 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1476 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1507 1477
1508 pl->ns->send_packet (sl); 1478 pl->ns->send_packet (sl);
1509 } 1479 }
1510 } 1480 }
1511 } 1481 }
… …
1541 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1511 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1542 return; 1512 return;
1543 } 1513 }
1544 1514
1545 /* store costs and damage in the object struct, to compare to later */ 1515 /* store costs and damage in the object struct, to compare to later */
1546 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1516 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1547 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1517 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1548 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1518 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1549 1519
1550 /* figure out which skill it uses, if it uses one */ 1520 /* figure out which skill it uses, if it uses one */
1551 if (spell->skill) 1521 if (spell->skill)
1552 { 1522 if (object *tmp = pl->find_skill (spell->skill))
1553 for (i = 1; i < NUM_SKILLS; i++)
1554 if (!strcmp (spell->skill, skill_names[i]))
1555 {
1556 skill = i + CS_STAT_SKILLINFO; 1523 skill = tmp->subtype + CS_STAT_SKILLINFO;
1557 break;
1558 }
1559 }
1560 1524
1561 // spells better have a face 1525 // spells better have a face
1562 if (!spell->face) 1526 if (!spell->face)
1563 { 1527 {
1564 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1528 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
… …
1569 1533
1570 /* send the current values */ 1534 /* send the current values */
1571 sl << uint32 (spell->count) 1535 sl << uint32 (spell->count)
1572 << uint16 (spell->level) 1536 << uint16 (spell->level)
1573 << uint16 (spell->casting_time) 1537 << uint16 (spell->casting_time)
1574 << uint16 (spell->last_sp) 1538 << uint16 (spell->cached_sp)
1575 << uint16 (spell->last_grace) 1539 << uint16 (spell->cached_grace)
1576 << uint16 (spell->last_eat) 1540 << uint16 (spell->cached_eat)
1577 << uint8 (skill) 1541 << uint8 (skill)
1578 << uint32 (spell->path_attuned) 1542 << uint32 (spell->path_attuned)
1579 << uint32 (spell->face) 1543 << uint32 (spell->face)
1580 << data8 (spell->name) 1544 << data8 (spell->name)
1581 << data16 (spell->msg); 1545 << data16 (spell->msg);

Diff Legend

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