1 | /* |
1 | /* |
2 | * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. |
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 it |
8 | * Deliantra is free software: you can redistribute it and/or modify it under |
9 | * under the terms of the GNU General Public License as published by the Free |
9 | * the terms of the Affero GNU General Public License as published by the |
10 | * Software Foundation; either version 2 of the License, or (at your option) |
10 | * Free Software Foundation, either version 3 of the License, or (at your |
11 | * any later version. |
11 | * option) any later version. |
12 | * |
12 | * |
13 | * This program is distributed in the hope that it will be useful, but |
13 | * This program is distributed in the hope that it will be useful, |
14 | * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | * 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 along |
18 | * You should have received a copy of the Affero GNU General Public License |
19 | * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 |
19 | * and the GNU General Public License along with this program. If not, see |
20 | * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
20 | * <http://www.gnu.org/licenses/>. |
21 | * |
21 | * |
22 | * The authors can be reached via e-mail to <crossfire@schmorp.de> |
22 | * The authors can be reached via e-mail to <support@deliantra.net> |
23 | */ |
23 | */ |
|
|
24 | |
|
|
25 | //+GPL |
24 | |
26 | |
25 | /** |
27 | /** |
26 | * \file |
28 | * \file |
27 | * Client handling. |
29 | * Client handling. |
28 | * |
30 | * |
… | |
… | |
99 | */ |
101 | */ |
100 | mx = ns->mapx; |
102 | mx = ns->mapx; |
101 | my = ns->mapy; |
103 | my = ns->mapy; |
102 | |
104 | |
103 | /* the x and y here are coordinates for the new map, i.e. if we moved |
105 | /* the x and y here are coordinates for the new map, i.e. if we moved |
104 | * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, |
106 | * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, |
105 | * if the destination x or y coordinate is outside the viewable |
107 | * if the destination x or y coordinate is outside the viewable |
106 | * area, we clear the values - otherwise, the old values |
108 | * area, we clear the values - otherwise, the old values |
107 | * are preserved, and the check_head thinks it needs to clear them. |
109 | * are preserved, and the check_head thinks it needs to clear them. |
108 | */ |
110 | */ |
109 | for (x = 0; x < mx; x++) |
111 | for (x = 0; x < mx; x++) |
110 | { |
|
|
111 | for (y = 0; y < my; y++) |
112 | for (y = 0; y < my; y++) |
112 | { |
|
|
113 | if (x >= ns->mapx || y >= ns->mapy) |
113 | if (x >= ns->mapx || y >= ns->mapy) |
114 | /* clear cells outside the viewable area */ |
114 | /* clear cells outside the viewable area */ |
115 | memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); |
115 | memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); |
116 | else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) |
116 | else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) |
117 | /* clear newly visible tiles within the viewable area */ |
117 | /* clear newly visible tiles within the viewable area */ |
118 | memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); |
118 | memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); |
119 | else |
119 | else |
120 | memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); |
120 | memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); |
121 | } |
|
|
122 | } |
|
|
123 | |
121 | |
124 | memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); |
122 | memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); |
125 | |
123 | |
126 | /* Make sure that the next "map1" command will be sent (even if it is |
124 | /* Make sure that the next "map1" command will be sent (even if it is |
127 | * empty). |
125 | * empty). |
… | |
… | |
130 | } |
128 | } |
131 | |
129 | |
132 | static void |
130 | static void |
133 | clear_map (player *pl) |
131 | clear_map (player *pl) |
134 | { |
132 | { |
|
|
133 | pl->ns->mapinfo_queue_clear (); |
|
|
134 | |
135 | memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); |
135 | memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); |
136 | |
136 | |
137 | pl->ns->force_newmap = false; |
137 | pl->ns->force_newmap = false; |
138 | |
138 | |
139 | if (pl->ns->newmapcmd == 1) |
139 | if (pl->ns->newmapcmd == 1) |
140 | pl->ns->send_packet ("newmap"); |
140 | pl->ns->send_packet ("newmap"); |
141 | |
141 | |
142 | pl->ns->floorbox_reset (); |
142 | pl->ns->floorbox_reset (); |
|
|
143 | } |
|
|
144 | |
|
|
145 | static void |
|
|
146 | send_map_info (player *pl) |
|
|
147 | { |
|
|
148 | client &socket = *pl->ns; |
|
|
149 | object *ob = pl->viewpoint; |
|
|
150 | |
|
|
151 | if (socket.mapinfocmd) |
|
|
152 | { |
|
|
153 | if (ob->map && ob->map->path[0]) |
|
|
154 | { |
|
|
155 | int flags = 0; |
|
|
156 | |
|
|
157 | if (ob->map->tile_path[0]) flags |= 1; |
|
|
158 | if (ob->map->tile_path[1]) flags |= 2; |
|
|
159 | if (ob->map->tile_path[2]) flags |= 4; |
|
|
160 | if (ob->map->tile_path[3]) flags |= 8; |
|
|
161 | |
|
|
162 | socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s", |
|
|
163 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, |
|
|
164 | ob->map->width, ob->map->height, &ob->map->path); |
|
|
165 | } |
|
|
166 | else |
|
|
167 | socket.send_packet ("mapinfo current"); |
|
|
168 | } |
143 | } |
169 | } |
144 | |
170 | |
145 | /** check for map/region change and send new map data */ |
171 | /** check for map/region change and send new map data */ |
146 | static void |
172 | static void |
147 | check_map_change (player *pl) |
173 | check_map_change (player *pl) |
148 | { |
174 | { |
149 | client &socket = *pl->ns; |
175 | client &socket = *pl->ns; |
150 | object *ob = pl->observe; |
176 | object *ob = pl->viewpoint; |
|
|
177 | |
|
|
178 | region *reg = ob->region (); |
|
|
179 | if (socket.current_region != reg) |
|
|
180 | { |
|
|
181 | INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region)); |
|
|
182 | socket.current_region = reg; |
|
|
183 | } |
|
|
184 | |
|
|
185 | // first try to aovid a full newmap on tiled map scrolls |
|
|
186 | if (socket.current_map != ob->map && !socket.force_newmap) |
|
|
187 | { |
|
|
188 | rv_vector rv; |
|
|
189 | |
|
|
190 | get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0); |
|
|
191 | |
|
|
192 | // manhattan distance is very handy here |
|
|
193 | if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient |
|
|
194 | { |
|
|
195 | socket.current_map = ob->map; |
|
|
196 | socket.current_x = ob->x; |
|
|
197 | socket.current_y = ob->y; |
|
|
198 | |
|
|
199 | socket_map_scroll (&socket, rv.distance_x, rv.distance_y); |
|
|
200 | socket.floorbox_reset (); |
|
|
201 | send_map_info (pl); |
|
|
202 | } |
|
|
203 | } |
151 | |
204 | |
152 | if (socket.current_map != ob->map || socket.force_newmap) |
205 | if (socket.current_map != ob->map || socket.force_newmap) |
153 | { |
206 | { |
154 | clear_map (pl); |
207 | clear_map (pl); |
155 | socket.current_map = ob->map; |
208 | socket.current_map = ob->map; |
156 | |
209 | send_map_info (pl); |
157 | if (socket.mapinfocmd) |
|
|
158 | { |
|
|
159 | if (ob->map && ob->map->path[0]) |
|
|
160 | { |
|
|
161 | int flags = 0; |
|
|
162 | |
|
|
163 | if (ob->map->tile_path[0]) flags |= 1; |
|
|
164 | if (ob->map->tile_path[1]) flags |= 2; |
|
|
165 | if (ob->map->tile_path[2]) flags |= 4; |
|
|
166 | if (ob->map->tile_path[3]) flags |= 8; |
|
|
167 | |
|
|
168 | socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s", |
|
|
169 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, |
|
|
170 | ob->map->width, ob->map->height, &ob->map->path); |
|
|
171 | } |
|
|
172 | else |
|
|
173 | socket.send_packet ("mapinfo current"); |
|
|
174 | } |
|
|
175 | } |
210 | } |
176 | else if (socket.current_x != ob->x || socket.current_y != ob->y) |
211 | else if (socket.current_x != ob->x || socket.current_y != ob->y) |
177 | { |
212 | { |
178 | int dx = ob->x - socket.current_x; |
213 | int dx = ob->x - socket.current_x; |
179 | int dy = ob->y - socket.current_y; |
214 | int dy = ob->y - socket.current_y; |
180 | |
215 | |
181 | if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) |
|
|
182 | clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows |
|
|
183 | else |
|
|
184 | { |
|
|
185 | socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); |
216 | socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); |
186 | socket.floorbox_reset (); |
217 | socket.floorbox_reset (); |
187 | } |
|
|
188 | } |
218 | } |
189 | |
219 | |
190 | socket.current_x = ob->x; |
220 | socket.current_x = ob->x; |
191 | socket.current_y = ob->y; |
221 | socket.current_y = ob->y; |
192 | |
|
|
193 | region *reg = ob->region (); |
|
|
194 | if (socket.current_region != reg) |
|
|
195 | { |
|
|
196 | socket.current_region = reg; |
|
|
197 | socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", ®->longname); |
|
|
198 | } |
|
|
199 | } |
222 | } |
200 | |
223 | |
201 | /** |
224 | /** |
202 | * RequestInfo is sort of a meta command. There is some specific |
225 | * RequestInfo is sort of a meta command. There is some specific |
203 | * request of information, but we call other functions to provide |
226 | * request of information, but we call other functions to provide |
204 | * that information. |
227 | * that information. |
205 | */ |
228 | */ |
206 | void |
229 | void |
207 | RequestInfo (char *buf, int len, client * ns) |
230 | RequestInfo (char *buf, int len, client *ns) |
208 | { |
231 | { |
209 | char *params = NULL, *cp; |
232 | char *params; |
210 | |
|
|
211 | /* No match */ |
|
|
212 | char bigbuf[MAX_BUF]; |
|
|
213 | int slen; |
|
|
214 | |
|
|
215 | /* Set up replyinfo before we modify any of the buffers - this is used |
|
|
216 | * if we don't find a match. |
|
|
217 | */ |
|
|
218 | strcpy (bigbuf, "replyinfo "); |
|
|
219 | slen = strlen (bigbuf); |
|
|
220 | safe_strcat (bigbuf, buf, &slen, MAX_BUF); |
|
|
221 | |
233 | |
222 | /* find the first space, make it null, and update the |
234 | /* find the first space, make it null, and update the |
223 | * params pointer. |
235 | * params pointer. |
224 | */ |
236 | */ |
225 | for (cp = buf; *cp != '\0'; cp++) |
237 | for (params = buf; *params; params++) |
226 | if (*cp == ' ') |
238 | if (*params == ' ') |
227 | { |
239 | { |
228 | *cp = '\0'; |
|
|
229 | params = cp + 1; |
240 | *params++ = 0; |
230 | break; |
241 | break; |
231 | } |
242 | } |
232 | |
243 | |
233 | if (!strcmp (buf, "image_info")) |
|
|
234 | send_image_info (ns, params); |
|
|
235 | else if (!strcmp (buf, "image_sums")) |
|
|
236 | send_image_sums (ns, params); |
|
|
237 | else if (!strcmp (buf, "skill_info")) |
244 | if (!strcmp (buf, "skill_info")) |
238 | send_skill_info (ns, params); |
245 | send_skill_info (ns, params); |
239 | else if (!strcmp (buf, "spell_paths")) |
246 | else if (!strcmp (buf, "spell_paths")) |
240 | send_spell_paths (ns, params); |
247 | send_spell_paths (ns, params); |
241 | else |
248 | else |
242 | ns->send_packet (bigbuf, len); |
249 | { |
|
|
250 | // undo tokenisation above and send replyinfo with the request unchanged |
|
|
251 | if (*params) |
|
|
252 | *--params = ' '; |
|
|
253 | |
|
|
254 | ns->send_packet_printf ("replyinfo %s", buf); |
|
|
255 | } |
243 | } |
256 | } |
244 | |
257 | |
245 | void |
258 | void |
246 | ExtCmd (char *buf, int len, player *pl) |
259 | ExtCmd (char *buf, int len, player *pl) |
247 | { |
260 | { |
… | |
… | |
250 | |
263 | |
251 | void |
264 | void |
252 | ExtiCmd (char *buf, int len, client *ns) |
265 | ExtiCmd (char *buf, int len, client *ns) |
253 | { |
266 | { |
254 | INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); |
267 | INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); |
|
|
268 | } |
|
|
269 | |
|
|
270 | //-GPL |
|
|
271 | |
|
|
272 | void |
|
|
273 | client::mapinfo_queue_clear () |
|
|
274 | { |
|
|
275 | for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) |
|
|
276 | free (*i); |
|
|
277 | |
|
|
278 | mapinfo_queue.clear (); |
|
|
279 | } |
|
|
280 | |
|
|
281 | bool |
|
|
282 | client::mapinfo_try (char *buf) |
|
|
283 | { |
|
|
284 | char *token = buf; |
|
|
285 | buf += strlen (buf) + 9; |
|
|
286 | |
|
|
287 | // initial map and its origin |
|
|
288 | maptile *map = pl->viewpoint->map; |
|
|
289 | int mapx = pl->ns->mapx / 2 - pl->viewpoint->x; |
|
|
290 | int mapy = pl->ns->mapy / 2 - pl->viewpoint->y; |
|
|
291 | int max_distance = 8; // limit maximum path length to something generous |
|
|
292 | |
|
|
293 | while (*buf && map && max_distance) |
|
|
294 | { |
|
|
295 | int dir = *buf++ - '1'; |
|
|
296 | |
|
|
297 | if (dir >= 0 && dir <= 3) |
|
|
298 | { |
|
|
299 | if (!map->tile_path [dir]) |
|
|
300 | map = 0; |
|
|
301 | else if (map->tile_available (dir, false)) |
|
|
302 | { |
|
|
303 | maptile *neigh = map->tile_map [dir]; |
|
|
304 | |
|
|
305 | switch (dir) |
|
|
306 | { |
|
|
307 | case 0: mapy -= neigh->height; break; |
|
|
308 | case 2: mapy += map ->height; break; |
|
|
309 | case 3: mapx -= neigh->width ; break; |
|
|
310 | case 1: mapx += map ->width ; break; |
|
|
311 | } |
|
|
312 | |
|
|
313 | map = neigh; |
|
|
314 | --max_distance; |
|
|
315 | } |
|
|
316 | else |
|
|
317 | return 0; |
|
|
318 | } |
|
|
319 | else |
|
|
320 | max_distance = 0; |
|
|
321 | } |
|
|
322 | |
|
|
323 | if (!max_distance) |
|
|
324 | send_packet_printf ("mapinfo %s error", token); |
|
|
325 | else if (!map || !map->path) |
|
|
326 | send_packet_printf ("mapinfo %s nomap", token); |
|
|
327 | else |
|
|
328 | { |
|
|
329 | int flags = 0; |
|
|
330 | |
|
|
331 | if (map->tile_path[0]) flags |= 1; |
|
|
332 | if (map->tile_path[1]) flags |= 2; |
|
|
333 | if (map->tile_path[2]) flags |= 4; |
|
|
334 | if (map->tile_path[3]) flags |= 8; |
|
|
335 | |
|
|
336 | send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); |
|
|
337 | } |
|
|
338 | |
|
|
339 | return 1; |
|
|
340 | } |
|
|
341 | |
|
|
342 | void |
|
|
343 | client::mapinfo_queue_run () |
|
|
344 | { |
|
|
345 | if (mapinfo_queue.empty () || !pl) |
|
|
346 | return; |
|
|
347 | |
|
|
348 | for (int i = 0; i < mapinfo_queue.size (); ++i) |
|
|
349 | if (mapinfo_try (mapinfo_queue [i])) |
|
|
350 | { |
|
|
351 | free (mapinfo_queue [i]); |
|
|
352 | mapinfo_queue.erase (i); |
|
|
353 | } |
|
|
354 | else |
|
|
355 | ++i; |
255 | } |
356 | } |
256 | |
357 | |
257 | void |
358 | void |
258 | MapInfoCmd (char *buf, int len, player *pl) |
359 | MapInfoCmd (char *buf, int len, player *pl) |
259 | { |
360 | { |
260 | // <mapinfo tag spatial tile-path |
361 | // <mapinfo tag spatial tile-path |
261 | // >mapinfo tag spatial flags x y w h hash |
362 | // >mapinfo tag spatial flags x y w h hash |
262 | |
363 | |
263 | char bigbuf[MAX_BUF], *token; |
|
|
264 | |
|
|
265 | token = buf; |
364 | char *token = buf; |
266 | // copy token |
365 | |
267 | if (!(buf = strchr (buf, ' '))) |
366 | if (!(buf = strchr (buf, ' '))) |
268 | return; |
367 | return; |
269 | |
368 | |
270 | *buf++ = 0; |
|
|
271 | |
|
|
272 | if (!strncmp (buf, "spatial ", 8)) |
369 | if (!strncmp (buf, " spatial ", 9)) |
273 | { |
370 | { |
274 | buf += 8; |
371 | char *copy = strdup (token); |
|
|
372 | copy [buf - token] = 0; |
275 | |
373 | |
276 | // initial map and its origin |
374 | #if 0 |
277 | maptile *map = pl->ob->map; |
375 | // this makes only sense when we flush the buffer immediately |
278 | sint16 dx, dy; |
376 | if (pl->ns->mapinfo_try (copy)) |
279 | int mapx = pl->ns->mapx / 2 - pl->ob->x; |
377 | free (copy); |
280 | int mapy = pl->ns->mapy / 2 - pl->ob->y; |
|
|
281 | int max_distance = 8; // limit maximum path length to something generous |
|
|
282 | |
|
|
283 | while (*buf && map && max_distance) |
|
|
284 | { |
|
|
285 | int dir = *buf++; |
|
|
286 | |
|
|
287 | switch (dir) |
|
|
288 | { |
|
|
289 | case '1': |
|
|
290 | dx = 0; |
|
|
291 | dy = -1; |
|
|
292 | map = map->xy_find (dx, dy); |
|
|
293 | map && (mapy -= map->height); |
|
|
294 | break; |
|
|
295 | case '2': |
|
|
296 | mapx += map->width; |
|
|
297 | dx = map->width; |
|
|
298 | dy = 0; |
|
|
299 | map = map->xy_find (dx, dy); |
|
|
300 | break; |
|
|
301 | case '3': |
|
|
302 | mapy += map->height; |
|
|
303 | dx = 0; |
|
|
304 | dy = map->height; |
|
|
305 | map = map->xy_find (dx, dy); |
|
|
306 | break; |
|
|
307 | case '4': |
|
|
308 | dx = -1; |
|
|
309 | dy = 0; |
|
|
310 | map = map->xy_find (dx, dy); |
|
|
311 | map && (mapx -= map->width); |
|
|
312 | break; |
|
|
313 | } |
|
|
314 | |
|
|
315 | --max_distance; |
|
|
316 | } |
|
|
317 | |
|
|
318 | if (!max_distance) |
|
|
319 | snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token); |
|
|
320 | else if (map && map->path[0]) |
|
|
321 | { |
|
|
322 | int flags = 0; |
|
|
323 | |
|
|
324 | if (map->tile_path[0]) flags |= 1; |
|
|
325 | if (map->tile_path[1]) flags |= 2; |
|
|
326 | if (map->tile_path[2]) flags |= 4; |
|
|
327 | if (map->tile_path[3]) flags |= 8; |
|
|
328 | |
|
|
329 | snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); |
|
|
330 | } |
|
|
331 | else |
378 | else |
332 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
379 | #endif |
|
|
380 | pl->ns->mapinfo_queue.push_back (copy); |
333 | } |
381 | } |
334 | else |
382 | else |
335 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
383 | pl->ns->send_packet_printf ("mapinfo %s unsupported", token); |
336 | |
|
|
337 | pl->ns->send_packet (bigbuf); |
|
|
338 | } |
384 | } |
339 | |
385 | |
340 | /** This is the Setup cmd */ |
386 | /** This is the Setup cmd */ |
341 | void |
387 | void |
342 | SetUp (char *buf, int len, client * ns) |
388 | SetUp (char *buf, int len, client * ns) |
… | |
… | |
354 | AddMeCmd (char *buf, int len, client *ns) |
400 | AddMeCmd (char *buf, int len, client *ns) |
355 | { |
401 | { |
356 | INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); |
402 | INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); |
357 | } |
403 | } |
358 | |
404 | |
359 | /** Reply to ExtendedInfos command */ |
405 | //+GPL |
360 | void |
|
|
361 | ToggleExtendedInfos (char *buf, int len, client * ns) |
|
|
362 | { |
|
|
363 | char cmdback[MAX_BUF]; |
|
|
364 | char command[50]; |
|
|
365 | int info, nextinfo; |
|
|
366 | |
|
|
367 | cmdback[0] = '\0'; |
|
|
368 | nextinfo = 0; |
|
|
369 | |
|
|
370 | while (1) |
|
|
371 | { |
|
|
372 | /* 1. Extract an info */ |
|
|
373 | info = nextinfo; |
|
|
374 | |
|
|
375 | while ((info < len) && (buf[info] == ' ')) |
|
|
376 | info++; |
|
|
377 | |
|
|
378 | if (info >= len) |
|
|
379 | break; |
|
|
380 | |
|
|
381 | nextinfo = info + 1; |
|
|
382 | |
|
|
383 | while ((nextinfo < len) && (buf[nextinfo] != ' ')) |
|
|
384 | nextinfo++; |
|
|
385 | |
|
|
386 | if (nextinfo - info >= 49) /*Erroneous info asked */ |
|
|
387 | continue; |
|
|
388 | |
|
|
389 | strncpy (command, &(buf[info]), nextinfo - info); |
|
|
390 | |
|
|
391 | /* 2. Interpret info */ |
|
|
392 | if (!strcmp ("smooth", command)) |
|
|
393 | /* Toggle smoothing */ |
|
|
394 | ns->EMI_smooth = !ns->EMI_smooth; |
|
|
395 | else |
|
|
396 | /*bad value */; |
|
|
397 | |
|
|
398 | /*3. Next info */ |
|
|
399 | } |
|
|
400 | |
|
|
401 | strcpy (cmdback, "ExtendedInfoSet"); |
|
|
402 | |
|
|
403 | if (ns->EMI_smooth) |
|
|
404 | { |
|
|
405 | strcat (cmdback, " "); |
|
|
406 | strcat (cmdback, "smoothing"); |
|
|
407 | } |
|
|
408 | |
|
|
409 | ns->send_packet (cmdback); |
|
|
410 | } |
|
|
411 | |
406 | |
412 | /* |
407 | /* |
413 | #define MSG_TYPE_BOOK 1 |
408 | #define MSG_TYPE_BOOK 1 |
414 | #define MSG_TYPE_CARD 2 |
409 | #define MSG_TYPE_CARD 2 |
415 | #define MSG_TYPE_PAPER 3 |
410 | #define MSG_TYPE_PAPER 3 |
… | |
… | |
432 | while (1) |
427 | while (1) |
433 | { |
428 | { |
434 | /* 1. Extract an info */ |
429 | /* 1. Extract an info */ |
435 | info = nextinfo; |
430 | info = nextinfo; |
436 | |
431 | |
437 | while ((info < len) && (buf[info] == ' ')) |
432 | while ((info < len) && (buf [info] == ' ')) |
438 | info++; |
433 | info++; |
439 | |
434 | |
440 | if (info >= len) |
435 | if (info >= len) |
441 | break; |
436 | break; |
442 | |
437 | |
443 | nextinfo = info + 1; |
438 | nextinfo = info + 1; |
444 | |
439 | |
445 | while ((nextinfo < len) && (buf[nextinfo] != ' ')) |
440 | while ((nextinfo < len) && (buf [nextinfo] != ' ')) |
446 | nextinfo++; |
441 | nextinfo++; |
447 | |
442 | |
448 | if (nextinfo - info >= 49) /*Erroneous info asked */ |
443 | if (nextinfo - info >= 49) /*Erroneous info asked */ |
449 | continue; |
444 | continue; |
450 | |
445 | |
451 | strncpy (command, &(buf[info]), nextinfo - info); |
446 | memcpy (command, buf + info, nextinfo - info); |
452 | command[nextinfo - info] = '\0'; |
447 | command [nextinfo - info] = 0; |
|
|
448 | |
453 | /* 2. Interpret info */ |
449 | /* 2. Interpret info */ |
454 | i = sscanf (command, "%d", &flag); |
450 | i = sscanf (command, "%d", &flag); |
455 | |
451 | |
456 | if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST)) |
452 | if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST)) |
457 | ns->supported_readables |= (1 << flag); |
453 | ns->supported_readables |= (1 << flag); |
… | |
… | |
471 | |
467 | |
472 | ns->send_packet (cmdback); |
468 | ns->send_packet (cmdback); |
473 | } |
469 | } |
474 | |
470 | |
475 | /** |
471 | /** |
476 | * client requested an image. send it rate-limited |
|
|
477 | * before flushing. |
|
|
478 | */ |
|
|
479 | void |
|
|
480 | AskFaceCmd (char *buf, int len, client *ns) |
|
|
481 | { |
|
|
482 | ns->askface.push_back (atoi (buf)); |
|
|
483 | } |
|
|
484 | |
|
|
485 | /** |
|
|
486 | * Tells client the picture it has to use |
|
|
487 | * to smooth a picture number given as argument. |
|
|
488 | */ |
|
|
489 | void |
|
|
490 | AskSmooth (char *buf, int len, client *ns) |
|
|
491 | { |
|
|
492 | ns->send_face (atoi (buf)); |
|
|
493 | ns->flush_fx (); |
|
|
494 | } |
|
|
495 | |
|
|
496 | /** |
|
|
497 | * This handles the general commands from the client (ie, north, fire, cast, |
472 | * This handles the general commands from the client (ie, north, fire, cast, |
498 | * etc.) |
473 | * etc.) |
499 | */ |
474 | */ |
500 | void |
475 | void |
501 | PlayerCmd (char *buf, int len, player *pl) |
476 | PlayerCmd (char *buf, int len, player *pl) |
… | |
… | |
512 | return; |
487 | return; |
513 | |
488 | |
514 | buf++; |
489 | buf++; |
515 | } |
490 | } |
516 | |
491 | |
517 | execute_newserver_command (pl->ob, (char *) buf); |
492 | execute_newserver_command (pl->ob, (char *)buf); |
518 | |
493 | |
519 | /* Perhaps something better should be done with a left over count. |
494 | /* Perhaps something better should be done with a left over count. |
520 | * Cleaning up the input should probably be done first - all actions |
495 | * Cleaning up the input should probably be done first - all actions |
521 | * for the command that issued the count should be done before any other |
496 | * for the command that issued the count should be done before any other |
522 | * commands. |
497 | * commands. |
… | |
… | |
533 | void |
508 | void |
534 | NewPlayerCmd (char *buf, int len, player *pl) |
509 | NewPlayerCmd (char *buf, int len, player *pl) |
535 | { |
510 | { |
536 | if (len <= 6) |
511 | if (len <= 6) |
537 | { |
512 | { |
538 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
513 | LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len); |
539 | return; |
514 | return; |
540 | } |
515 | } |
541 | |
516 | |
542 | uint16 cmdid = net_uint16 ((uint8 *)buf); |
517 | uint16 cmdid = net_uint16 ((uint8 *)buf); |
543 | sint32 repeat = net_sint32 ((uint8 *)buf + 2); |
518 | sint32 repeat = net_sint32 ((uint8 *)buf + 2); |
… | |
… | |
681 | * syntax is: move (to) (tag) (nrof) |
656 | * syntax is: move (to) (tag) (nrof) |
682 | */ |
657 | */ |
683 | void |
658 | void |
684 | MoveCmd (char *buf, int len, player *pl) |
659 | MoveCmd (char *buf, int len, player *pl) |
685 | { |
660 | { |
686 | int vals[3], i; |
661 | int to, tag, nrof; |
687 | |
662 | |
688 | /* A little funky here. We only cycle for 2 records, because |
663 | if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof)) |
689 | * we obviously are not going to find a space after the third |
|
|
690 | * record. Perhaps we should just replace this with a |
|
|
691 | * sscanf? |
|
|
692 | */ |
|
|
693 | for (i = 0; i < 2; i++) |
|
|
694 | { |
664 | { |
695 | vals[i] = atoi (buf); |
|
|
696 | |
|
|
697 | if (!(buf = strchr (buf, ' '))) |
|
|
698 | { |
|
|
699 | LOG (llevError, "Incomplete move command: %s\n", buf); |
665 | LOG (llevError, "Incomplete move command: %s\n", buf); |
700 | return; |
666 | return; |
701 | } |
|
|
702 | |
|
|
703 | buf++; |
|
|
704 | } |
667 | } |
705 | |
668 | |
706 | vals[2] = atoi (buf); |
669 | esrv_move_object (pl->ob, to, tag, nrof); |
707 | |
|
|
708 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
|
|
709 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
|
|
710 | } |
670 | } |
711 | |
671 | |
712 | /****************************************************************************** |
672 | /****************************************************************************** |
713 | * |
673 | * |
714 | * Start of commands the server sends to the client. |
674 | * Start of commands the server sends to the client. |
… | |
… | |
729 | * Get player's current range attack in obuf. |
689 | * Get player's current range attack in obuf. |
730 | */ |
690 | */ |
731 | static void |
691 | static void |
732 | rangetostring (player *pl, char *obuf) |
692 | rangetostring (player *pl, char *obuf) |
733 | { |
693 | { |
734 | dynbuf_text buf; |
694 | dynbuf_text &buf = msg_dynbuf; buf.clear (); |
735 | |
695 | |
736 | if (pl->ranged_ob) |
696 | if (pl->ranged_ob) |
737 | buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; |
697 | buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; |
738 | |
698 | |
739 | if (pl->combat_ob) |
699 | if (pl->combat_ob) |
… | |
… | |
747 | |
707 | |
748 | //TODO: maybe golem should become the current_weapon, quite simply? |
708 | //TODO: maybe golem should become the current_weapon, quite simply? |
749 | if (pl->golem) |
709 | if (pl->golem) |
750 | buf << " Golem*: " << pl->golem->name; |
710 | buf << " Golem*: " << pl->golem->name; |
751 | |
711 | |
|
|
712 | buf << '\0'; |
752 | buf.linearise (obuf); |
713 | buf.linearise (obuf); |
753 | obuf [buf.size ()] = 0; |
|
|
754 | } |
714 | } |
755 | |
715 | |
756 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
716 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
757 | Old = New; \ |
717 | Old = New; \ |
758 | sl << uint8 (Type) << uint64 (New); \ |
718 | sl << uint8 (Type) << uint64 (New); \ |
… | |
… | |
815 | AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); |
775 | AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); |
816 | AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); |
776 | AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); |
817 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
777 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
818 | |
778 | |
819 | for (int s = 0; s < NUM_SKILLS; s++) |
779 | for (int s = 0; s < NUM_SKILLS; s++) |
820 | if (object *skill = opl->last_skill_ob[s]) |
780 | if (object *skill = opl->last_skill_ob [s]) |
821 | if (skill->stats.exp != ns->last_skill_exp [s]) |
781 | if (skill->stats.exp != ns->last_skill_exp [s]) |
822 | { |
782 | { |
823 | ns->last_skill_exp [s] = skill->stats.exp; |
783 | ns->last_skill_exp [s] = skill->stats.exp; |
824 | |
784 | |
825 | /* Always send along the level if exp changes. This is only |
785 | /* Always send along the level if exp changes. This is only |
… | |
… | |
881 | |
841 | |
882 | /** |
842 | /** |
883 | * Tells the client that here is a player it should start using. |
843 | * Tells the client that here is a player it should start using. |
884 | */ |
844 | */ |
885 | void |
845 | void |
886 | esrv_new_player (player *pl, uint32 weight) |
846 | esrv_new_player (player *pl) |
887 | { |
847 | { |
|
|
848 | sint32 weight = pl->ob->client_weight (); |
|
|
849 | |
888 | packet sl ("player"); |
850 | packet sl ("player"); |
889 | |
851 | |
890 | sl << uint32 (pl->ob->count) |
852 | sl << uint32 (pl->ob->count) |
891 | << uint32 (weight) |
853 | << uint32 (weight) |
892 | << uint32 (pl->ob->face) |
854 | << uint32 (pl->ob->face) |
893 | << data8 (pl->ob->name); |
855 | << data8 (pl->ob->name); |
894 | |
856 | |
895 | pl->ns->last_weight = weight; |
857 | pl->ns->last_weight = weight; |
896 | pl->ns->send_packet (sl); |
858 | pl->ns->send_packet (sl); |
897 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
|
|
898 | } |
859 | } |
899 | |
860 | |
900 | /****************************************************************************** |
861 | /****************************************************************************** |
901 | * |
862 | * |
902 | * Start of map related commands. |
863 | * Start of map related commands. |
… | |
… | |
959 | |
920 | |
960 | if (!ns.faces_sent[face_num]) |
921 | if (!ns.faces_sent[face_num]) |
961 | if (ob) |
922 | if (ob) |
962 | ns.send_faces (ob); |
923 | ns.send_faces (ob); |
963 | else |
924 | else |
964 | ns.send_face (face_num); |
925 | ns.send_face (face_num, 10); |
965 | |
926 | |
966 | sl << uint16 (face_num); |
927 | sl << uint16 (face_num); |
967 | return 1; |
928 | return 1; |
968 | } |
929 | } |
969 | |
930 | |
970 | /* Nothing changed */ |
931 | /* Nothing changed */ |
971 | return 0; |
932 | return 0; |
972 | } |
933 | } |
973 | |
934 | |
974 | /** |
935 | //-GPL |
975 | * Returns the size of a data for a map square as returned by |
|
|
976 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
|
|
977 | * available. |
|
|
978 | */ |
|
|
979 | int |
|
|
980 | getExtendedMapInfoSize (client * ns) |
|
|
981 | { |
|
|
982 | int result = 0; |
|
|
983 | |
|
|
984 | if (ns->ext_mapinfos) |
|
|
985 | { |
|
|
986 | if (ns->EMI_smooth) |
|
|
987 | result += 1; /*One byte for smoothlevel */ |
|
|
988 | } |
|
|
989 | |
|
|
990 | return result; |
|
|
991 | } |
|
|
992 | |
936 | |
993 | // prefetch (and touch) all maps within a specific distancd |
937 | // prefetch (and touch) all maps within a specific distancd |
994 | static void |
938 | static void |
995 | prefetch_surrounding_maps (maptile *map, int distance) |
939 | prefetch_surrounding_maps (maptile *map, int distance) |
996 | { |
940 | { |
997 | map->last_access = runtime; |
941 | map->touch (); |
998 | |
942 | |
999 | if (--distance) |
943 | if (--distance) |
1000 | for (int dir = 4; --dir; ) |
944 | for (int dir = 4; --dir; ) |
1001 | if (const shstr &path = map->tile_path [dir]) |
945 | if (const shstr &path = map->tile_path [dir]) |
1002 | if (maptile *&neigh = map->tile_map [dir]) |
946 | if (maptile *&neigh = map->tile_map [dir]) |
… | |
… | |
1010 | prefetch_surrounding_maps (object *op) |
954 | prefetch_surrounding_maps (object *op) |
1011 | { |
955 | { |
1012 | prefetch_surrounding_maps (op->map, 3); |
956 | prefetch_surrounding_maps (op->map, 3); |
1013 | } |
957 | } |
1014 | |
958 | |
|
|
959 | //+GPL |
|
|
960 | |
1015 | /** |
961 | /** |
1016 | * Draws client map. |
962 | * Draws client map. |
1017 | */ |
963 | */ |
1018 | void |
964 | void |
1019 | draw_client_map (player *pl) |
965 | draw_client_map (player *pl) |
1020 | { |
966 | { |
1021 | object *ob = pl->observe; |
967 | object *ob = pl->viewpoint; |
1022 | if (!ob->active) |
968 | if (!pl->observe->active) |
1023 | return; |
969 | return; |
1024 | |
|
|
1025 | maptile *plmap = ob->map; |
|
|
1026 | |
970 | |
1027 | /* If player is just joining the game, he isn't here yet, so the map |
971 | /* If player is just joining the game, he isn't here yet, so the map |
1028 | * can get swapped out. If so, don't try to send them a map. All will |
972 | * can get swapped out. If so, don't try to send them a map. All will |
1029 | * be OK once they really log in. |
973 | * be OK once they really log in. |
1030 | */ |
974 | */ |
1031 | if (!plmap || plmap->in_memory != MAP_IN_MEMORY) |
975 | if (!ob->map || ob->map->in_memory != MAP_ACTIVE) |
1032 | return; |
976 | return; |
1033 | |
977 | |
1034 | int x, y, ax, ay, startlen, max_x, max_y, oldlen; |
|
|
1035 | sint16 nx, ny; |
|
|
1036 | int estartlen, eoldlen; |
978 | int startlen, oldlen; |
1037 | uint8 eentrysize; |
|
|
1038 | uint16 ewhatstart, ewhatflag; |
|
|
1039 | uint8 extendedinfos; |
|
|
1040 | maptile *m; |
|
|
1041 | |
979 | |
1042 | check_map_change (pl); |
980 | check_map_change (pl); |
1043 | prefetch_surrounding_maps (pl->ob); |
981 | prefetch_surrounding_maps (pl->ob); |
1044 | |
982 | |
1045 | /* do LOS after calls to update_position */ |
983 | /* do LOS after calls to update_position */ |
1046 | if (ob != pl->ob) |
984 | /* unfortunately, we need to udpate los when observing, currently */ |
1047 | clear_los (pl); |
985 | if (pl->do_los || pl->viewpoint != pl->ob) |
1048 | else if (pl->do_los) |
|
|
1049 | { |
986 | { |
1050 | update_los (ob); |
|
|
1051 | pl->do_los = 0; |
987 | pl->do_los = 0; |
|
|
988 | pl->update_los (); |
1052 | } |
989 | } |
1053 | |
990 | |
1054 | /** |
991 | /** |
1055 | * This function uses the new map1 protocol command to send the map |
992 | * This function uses the new map1 protocol command to send the map |
1056 | * to the client. It is necessary because the old map command supports |
993 | * to the client. It is necessary because the old map command supports |
… | |
… | |
1075 | */ |
1012 | */ |
1076 | |
1013 | |
1077 | client &socket = *pl->ns; |
1014 | client &socket = *pl->ns; |
1078 | |
1015 | |
1079 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1016 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1080 | packet esl; |
|
|
1081 | |
1017 | |
1082 | startlen = sl.length (); |
1018 | startlen = sl.length (); |
1083 | |
1019 | |
1084 | /*Extendedmapinfo structure initialisation */ |
1020 | int hx = socket.mapx / 2; |
1085 | if (socket.ext_mapinfos) |
1021 | int hy = socket.mapy / 2; |
1086 | { |
|
|
1087 | extendedinfos = EMI_NOREDRAW; |
|
|
1088 | |
1022 | |
1089 | if (socket.EMI_smooth) |
1023 | ordered_mapwalk_begin (ob, -hx, -hy, hx, hy) |
1090 | extendedinfos |= EMI_SMOOTH; |
1024 | int ax = dx + hx; |
|
|
1025 | int ay = dy + hy; |
1091 | |
1026 | |
1092 | ewhatstart = esl.length (); |
1027 | int mask = (ax << 10) | (ay << 4); |
1093 | ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit |
|
|
1094 | could need to be taken away */ |
|
|
1095 | eentrysize = getExtendedMapInfoSize (&socket); |
|
|
1096 | esl << "mapextended " |
|
|
1097 | << uint8 (extendedinfos) |
|
|
1098 | << uint8 (eentrysize); |
|
|
1099 | |
|
|
1100 | estartlen = esl.length (); |
|
|
1101 | } |
|
|
1102 | |
|
|
1103 | /* x,y are the real map locations. ax, ay are viewport relative |
|
|
1104 | * locations. |
|
|
1105 | */ |
|
|
1106 | ay = 0; |
|
|
1107 | |
|
|
1108 | /* We could do this logic as conditionals in the if statement, |
|
|
1109 | * but that started to get a bit messy to look at. |
|
|
1110 | */ |
|
|
1111 | max_x = ob->x + (socket.mapx + 1) / 2; |
|
|
1112 | max_y = ob->y + (socket.mapy + 1) / 2; |
|
|
1113 | |
|
|
1114 | for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++) |
|
|
1115 | { |
|
|
1116 | ax = 0; |
|
|
1117 | for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) |
|
|
1118 | { |
|
|
1119 | int emask, mask; |
|
|
1120 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
|
|
1121 | |
|
|
1122 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1028 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1123 | |
1029 | |
1124 | /* If the coordinates are not valid, or it is too dark to see, |
1030 | /* If the coordinates are not valid, or it is too dark to see, |
1125 | * we tell the client as such |
1031 | * we tell the client as such |
|
|
1032 | */ |
|
|
1033 | if (!m) |
|
|
1034 | { |
|
|
1035 | /* space is out of map. Update space and clear values |
|
|
1036 | * if this hasn't already been done. If the space is out |
|
|
1037 | * of the map, it shouldn't have a head. |
1126 | */ |
1038 | */ |
1127 | nx = x; |
1039 | if (lastcell.count != -1) |
1128 | ny = y; |
1040 | { |
1129 | m = get_map_from_coord (plmap, &nx, &ny); |
1041 | sl << uint16 (mask); |
|
|
1042 | map_clearcell (&lastcell, -1); |
|
|
1043 | } |
1130 | |
1044 | |
1131 | if (!m) |
1045 | continue; |
|
|
1046 | } |
|
|
1047 | |
|
|
1048 | int d = pl->blocked_los_uc (dx, dy); |
|
|
1049 | |
|
|
1050 | if (d > 3) |
|
|
1051 | { |
|
|
1052 | /* This block deals with spaces that are not visible for whatever |
|
|
1053 | * reason. Still may need to send the head for this space. |
|
|
1054 | */ |
|
|
1055 | if (lastcell.count != -1 |
|
|
1056 | || lastcell.faces[0] |
|
|
1057 | || lastcell.faces[1] |
|
|
1058 | || lastcell.faces[2] |
|
|
1059 | || lastcell.stat_hp |
|
|
1060 | || lastcell.flags |
|
|
1061 | || lastcell.player) |
|
|
1062 | sl << uint16 (mask); |
|
|
1063 | |
|
|
1064 | /* properly clear a previously sent big face */ |
|
|
1065 | map_clearcell (&lastcell, -1); |
|
|
1066 | } |
|
|
1067 | else |
|
|
1068 | { |
|
|
1069 | /* In this block, the space is visible. |
|
|
1070 | */ |
|
|
1071 | |
|
|
1072 | /* Rather than try to figure out what everything that we might |
|
|
1073 | * need to send is, then form the packet after that, |
|
|
1074 | * we presume that we will in fact form a packet, and update |
|
|
1075 | * the bits by what we do actually send. If we send nothing, |
|
|
1076 | * we just back out sl.length () to the old value, and no harm |
|
|
1077 | * is done. |
|
|
1078 | * I think this is simpler than doing a bunch of checks to see |
|
|
1079 | * what if anything we need to send, setting the bits, then |
|
|
1080 | * doing those checks again to add the real data. |
|
|
1081 | */ |
|
|
1082 | oldlen = sl.length (); |
|
|
1083 | |
|
|
1084 | sl << uint16 (mask); |
|
|
1085 | |
|
|
1086 | unsigned char dummy; |
|
|
1087 | unsigned char *last_ext = &dummy; |
|
|
1088 | |
|
|
1089 | /* Darkness changed */ |
|
|
1090 | if (lastcell.count != d) |
|
|
1091 | { |
|
|
1092 | mask |= 0x8; |
|
|
1093 | |
|
|
1094 | *last_ext |= 0x80; |
|
|
1095 | last_ext = &sl[sl.length ()]; |
|
|
1096 | sl << uint8 (d); |
|
|
1097 | } |
|
|
1098 | |
|
|
1099 | lastcell.count = d; |
|
|
1100 | |
|
|
1101 | mapspace &ms = m->at (nx, ny); |
|
|
1102 | ms.update (); |
|
|
1103 | |
|
|
1104 | // extmap handling |
|
|
1105 | uint8 stat_hp = 0; |
|
|
1106 | uint8 stat_width = 0; |
|
|
1107 | uint8 flags = 0; |
|
|
1108 | tag_t player = 0; |
|
|
1109 | |
|
|
1110 | // send hp information, if applicable |
|
|
1111 | if (object *op = ms.faces_obj [0]) |
|
|
1112 | if (op->is_head () && !op->invisible) |
1132 | { |
1113 | { |
1133 | /* space is out of map. Update space and clear values |
1114 | if (op->stats.maxhp > op->stats.hp |
1134 | * if this hasn't already been done. If the space is out |
1115 | && op->stats.maxhp > 0 |
1135 | * of the map, it shouldn't have a head |
1116 | && (op->type == PLAYER |
1136 | */ |
1117 | || op->type == DOOR // does not work, have maxhp 0 |
1137 | if (lastcell.count != -1) |
1118 | || QUERY_FLAG (op, FLAG_MONSTER) |
|
|
1119 | || QUERY_FLAG (op, FLAG_ALIVE) |
|
|
1120 | || QUERY_FLAG (op, FLAG_GENERATOR))) |
1138 | { |
1121 | { |
1139 | sl << uint16 (mask); |
1122 | stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; |
1140 | map_clearcell (&lastcell, -1); |
1123 | stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge |
1141 | } |
1124 | } |
1142 | |
1125 | |
1143 | continue; |
1126 | if (expect_false (op->has_dialogue ())) |
|
|
1127 | flags |= 1; |
|
|
1128 | |
|
|
1129 | if (expect_false (op->type == PLAYER)) |
|
|
1130 | player = op == ob ? pl->ob->count |
|
|
1131 | : op == pl->ob ? ob->count |
|
|
1132 | : op->count; |
1144 | } |
1133 | } |
1145 | |
|
|
1146 | m->touch (); |
|
|
1147 | |
1134 | |
1148 | int d = pl->blocked_los[ax][ay]; |
1135 | if (expect_false (lastcell.stat_hp != stat_hp)) |
1149 | |
|
|
1150 | if (d > 3) |
|
|
1151 | { |
1136 | { |
|
|
1137 | lastcell.stat_hp = stat_hp; |
1152 | |
1138 | |
1153 | int need_send = 0, count; |
1139 | mask |= 0x8; |
|
|
1140 | *last_ext |= 0x80; |
|
|
1141 | last_ext = &sl[sl.length ()]; |
1154 | |
1142 | |
1155 | /* This block deals with spaces that are not visible for whatever |
1143 | sl << uint8 (5) << uint8 (stat_hp); |
1156 | * reason. Still may need to send the head for this space. |
|
|
1157 | */ |
|
|
1158 | |
1144 | |
1159 | oldlen = sl.length (); |
1145 | if (stat_width > 1) |
1160 | |
|
|
1161 | sl << uint16 (mask); |
|
|
1162 | |
|
|
1163 | if (lastcell.count != -1) |
|
|
1164 | need_send = 1; |
|
|
1165 | |
|
|
1166 | count = -1; |
|
|
1167 | |
|
|
1168 | /* properly clear a previously sent big face */ |
|
|
1169 | if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] |
|
|
1170 | || lastcell.stat_hp || lastcell.flags || lastcell.player) |
|
|
1171 | need_send = 1; |
|
|
1172 | |
|
|
1173 | map_clearcell (&lastcell, count); |
|
|
1174 | |
|
|
1175 | if ((mask & 0xf) || need_send) |
|
|
1176 | sl[oldlen + 1] = mask & 0xff; |
|
|
1177 | else |
|
|
1178 | sl.reset (oldlen); |
|
|
1179 | } |
|
|
1180 | else |
|
|
1181 | { |
|
|
1182 | /* In this block, the space is visible. |
|
|
1183 | */ |
|
|
1184 | |
|
|
1185 | /* Rather than try to figure out what everything that we might |
|
|
1186 | * need to send is, then form the packet after that, |
|
|
1187 | * we presume that we will in fact form a packet, and update |
|
|
1188 | * the bits by what we do actually send. If we send nothing, |
|
|
1189 | * we just back out sl.length () to the old value, and no harm |
|
|
1190 | * is done. |
|
|
1191 | * I think this is simpler than doing a bunch of checks to see |
|
|
1192 | * what if anything we need to send, setting the bits, then |
|
|
1193 | * doing those checks again to add the real data. |
|
|
1194 | */ |
|
|
1195 | oldlen = sl.length (); |
|
|
1196 | eoldlen = esl.length (); |
|
|
1197 | |
|
|
1198 | sl << uint16 (mask); |
|
|
1199 | |
|
|
1200 | unsigned char dummy; |
|
|
1201 | unsigned char *last_ext = &dummy; |
|
|
1202 | |
|
|
1203 | /* Darkness changed */ |
|
|
1204 | if (lastcell.count != d && socket.darkness) |
|
|
1205 | { |
1146 | { |
1206 | mask |= 0x8; |
|
|
1207 | |
|
|
1208 | if (socket.extmap) |
|
|
1209 | { |
|
|
1210 | *last_ext |= 0x80; |
1147 | *last_ext |= 0x80; |
1211 | last_ext = &sl[sl.length ()]; |
1148 | last_ext = &sl[sl.length ()]; |
1212 | sl << uint8 (d); |
1149 | |
1213 | } |
1150 | sl << uint8 (6) << uint8 (stat_width); |
1214 | else |
|
|
1215 | sl << uint8 (255 - 64 * d); |
|
|
1216 | } |
1151 | } |
|
|
1152 | } |
1217 | |
1153 | |
1218 | lastcell.count = d; |
1154 | if (expect_false (lastcell.player != player)) |
1219 | |
|
|
1220 | mapspace &ms = m->at (nx, ny); |
|
|
1221 | ms.update (); |
|
|
1222 | |
|
|
1223 | if (socket.extmap) |
|
|
1224 | { |
1155 | { |
1225 | uint8 stat_hp = 0; |
1156 | lastcell.player = player; |
1226 | uint8 stat_width = 0; |
|
|
1227 | uint8 flags = 0; |
|
|
1228 | tag_t player = 0; |
|
|
1229 | |
1157 | |
1230 | // send hp information, if applicable |
|
|
1231 | if (object *op = ms.faces_obj [0]) |
|
|
1232 | { |
|
|
1233 | if (op->head || op->invisible) |
|
|
1234 | ; // do not show |
|
|
1235 | else if (op->type == PLAYER |
|
|
1236 | || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) |
|
|
1237 | { |
|
|
1238 | if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) |
|
|
1239 | { |
|
|
1240 | stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; |
|
|
1241 | stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge |
|
|
1242 | } |
|
|
1243 | } |
|
|
1244 | |
|
|
1245 | if (op->msg && op->msg[0] == '@') |
|
|
1246 | flags |= 1; |
|
|
1247 | |
|
|
1248 | if (op->type == PLAYER && op != ob) |
|
|
1249 | player = op->count; |
|
|
1250 | } |
|
|
1251 | |
|
|
1252 | if (lastcell.stat_hp != stat_hp) |
|
|
1253 | { |
|
|
1254 | lastcell.stat_hp = stat_hp; |
|
|
1255 | |
|
|
1256 | mask |= 0x8; |
1158 | mask |= 0x8; |
1257 | *last_ext |= 0x80; |
1159 | *last_ext |= 0x80; |
1258 | last_ext = &sl[sl.length ()]; |
1160 | last_ext = &sl[sl.length ()]; |
1259 | |
1161 | |
1260 | sl << uint8 (5) << uint8 (stat_hp); |
|
|
1261 | |
|
|
1262 | if (stat_width > 1) |
|
|
1263 | { |
|
|
1264 | *last_ext |= 0x80; |
|
|
1265 | last_ext = &sl[sl.length ()]; |
|
|
1266 | |
|
|
1267 | sl << uint8 (6) << uint8 (stat_width); |
|
|
1268 | } |
|
|
1269 | } |
|
|
1270 | |
|
|
1271 | if (lastcell.player != player) |
|
|
1272 | { |
|
|
1273 | lastcell.player = player; |
|
|
1274 | |
|
|
1275 | mask |= 0x8; |
|
|
1276 | *last_ext |= 0x80; |
|
|
1277 | last_ext = &sl[sl.length ()]; |
|
|
1278 | |
|
|
1279 | sl << uint8 (0x47) << uint8 (4) << (uint32)player; |
1162 | sl << uint8 (0x47) << uint8 (4) << (uint32)player; |
1280 | } |
1163 | } |
1281 | |
1164 | |
1282 | if (lastcell.flags != flags) |
1165 | if (expect_false (lastcell.flags != flags)) |
1283 | { |
1166 | { |
1284 | lastcell.flags = flags; |
1167 | lastcell.flags = flags; |
1285 | |
1168 | |
1286 | mask |= 0x8; |
1169 | mask |= 0x8; |
1287 | *last_ext |= 0x80; |
1170 | *last_ext |= 0x80; |
1288 | last_ext = &sl[sl.length ()]; |
1171 | last_ext = &sl[sl.length ()]; |
1289 | |
1172 | |
1290 | sl << uint8 (8) << uint8 (flags); |
1173 | sl << uint8 (8) << uint8 (flags); |
1291 | } |
|
|
1292 | } |
1174 | } |
1293 | |
1175 | |
|
|
1176 | // faces |
|
|
1177 | |
1294 | /* Floor face */ |
1178 | /* Floor face */ |
1295 | if (update_space (sl, socket, ms, lastcell, 2)) |
1179 | if (update_space (sl, socket, ms, lastcell, 2)) |
1296 | mask |= 0x4; |
1180 | mask |= 0x4; |
1297 | |
1181 | |
1298 | /* Middle face */ |
1182 | /* Middle face */ |
1299 | if (update_space (sl, socket, ms, lastcell, 1)) |
1183 | if (update_space (sl, socket, ms, lastcell, 1)) |
1300 | mask |= 0x2; |
1184 | mask |= 0x2; |
1301 | |
1185 | |
|
|
1186 | if (expect_false (ob->invisible) |
|
|
1187 | && ob->invisible & (ob->invisible < 50 ? 1 : 7) |
1302 | if (ms.player () == ob |
1188 | && ms.player () == ob) |
1303 | && (ob->invisible & (ob->invisible < 50 ? 1 : 7))) |
|
|
1304 | { |
1189 | { |
1305 | // force player to be visible to himself if invisible |
1190 | // force player to be visible to himself if invisible |
1306 | if (lastcell.faces[0] != ob->face) |
1191 | if (lastcell.faces[0] != ob->face) |
1307 | { |
1192 | { |
1308 | lastcell.faces[0] = ob->face; |
1193 | lastcell.faces[0] = ob->face; |
1309 | |
1194 | |
1310 | mask |= 0x1; |
|
|
1311 | sl << uint16 (ob->face); |
|
|
1312 | |
|
|
1313 | socket.send_faces (ob); |
|
|
1314 | } |
|
|
1315 | } |
|
|
1316 | /* Top face */ |
|
|
1317 | else if (update_space (sl, socket, ms, lastcell, 0)) |
|
|
1318 | mask |= 0x1; |
1195 | mask |= 0x1; |
|
|
1196 | sl << uint16 (ob->face); |
1319 | |
1197 | |
|
|
1198 | socket.send_faces (ob); |
|
|
1199 | } |
|
|
1200 | } |
|
|
1201 | /* Top face */ |
|
|
1202 | else if (update_space (sl, socket, ms, lastcell, 0)) |
|
|
1203 | mask |= 0x1; |
|
|
1204 | |
1320 | /* Check to see if we are in fact sending anything for this |
1205 | /* Check to see if we are in fact sending anything for this |
1321 | * space by checking the mask. If so, update the mask. |
1206 | * space by checking the mask. If so, update the mask. |
1322 | * if not, reset the len to that from before adding the mask |
1207 | * if not, reset the len to that from before adding the mask |
1323 | * value, so we don't send those bits. |
1208 | * value, so we don't send those bits. |
1324 | */ |
1209 | */ |
1325 | if (mask & 0xf) |
1210 | if (mask & 0xf) |
1326 | sl[oldlen + 1] = mask & 0xff; |
1211 | sl[oldlen + 1] = mask & 0xff; |
1327 | else |
1212 | else |
1328 | sl.reset (oldlen); |
1213 | sl.reset (oldlen); |
1329 | |
|
|
1330 | if (socket.ext_mapinfos) |
|
|
1331 | esl << uint16 (emask); |
|
|
1332 | |
|
|
1333 | if (socket.EMI_smooth) |
|
|
1334 | { |
|
|
1335 | for (int layer = 2+1; layer--; ) |
|
|
1336 | { |
|
|
1337 | object *ob = ms.faces_obj [layer]; |
|
|
1338 | |
|
|
1339 | // If there is no object for this space, or if the face for the object |
|
|
1340 | // is the blank face, set the smoothlevel to zero. |
|
|
1341 | int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0; |
|
|
1342 | |
|
|
1343 | // We've gotten what face we want to use for the object. Now see if |
|
|
1344 | // if it has changed since we last sent it to the client. |
|
|
1345 | if (lastcell.smooth[layer] != smoothlevel) |
|
|
1346 | { |
|
|
1347 | lastcell.smooth[layer] = smoothlevel; |
|
|
1348 | esl << uint8 (smoothlevel); |
|
|
1349 | emask |= 1 << layer; |
|
|
1350 | } |
|
|
1351 | } |
|
|
1352 | |
|
|
1353 | if (emask & 0xf) |
|
|
1354 | esl[eoldlen + 1] = emask & 0xff; |
|
|
1355 | else |
|
|
1356 | esl.reset (eoldlen); |
|
|
1357 | } |
|
|
1358 | } /* else this is a viewable space */ |
1214 | } /* else this is a viewable space */ |
1359 | } /* for x loop */ |
1215 | ordered_mapwalk_end |
1360 | } /* for y loop */ |
|
|
1361 | |
1216 | |
1362 | socket.flush_fx (); |
1217 | socket.flush_fx (); |
1363 | |
|
|
1364 | /* Verify that we in fact do need to send this */ |
|
|
1365 | if (socket.ext_mapinfos) |
|
|
1366 | { |
|
|
1367 | if (!(sl.length () > startlen || socket.sent_scroll)) |
|
|
1368 | { |
|
|
1369 | /* No map data will follow, so don't say the client |
|
|
1370 | * it doesn't need draw! |
|
|
1371 | */ |
|
|
1372 | ewhatflag &= ~EMI_NOREDRAW; |
|
|
1373 | esl[ewhatstart + 1] = ewhatflag & 0xff; |
|
|
1374 | } |
|
|
1375 | |
|
|
1376 | if (esl.length () > estartlen) |
|
|
1377 | socket.send_packet (esl); |
|
|
1378 | } |
|
|
1379 | |
1218 | |
1380 | if (sl.length () > startlen || socket.sent_scroll) |
1219 | if (sl.length () > startlen || socket.sent_scroll) |
1381 | { |
1220 | { |
1382 | socket.send_packet (sl); |
1221 | socket.send_packet (sl); |
1383 | socket.sent_scroll = 0; |
1222 | socket.sent_scroll = 0; |
… | |
… | |
1404 | { |
1243 | { |
1405 | packet sl; |
1244 | packet sl; |
1406 | sl << "replyinfo skill_info\n"; |
1245 | sl << "replyinfo skill_info\n"; |
1407 | |
1246 | |
1408 | for (int i = 1; i < NUM_SKILLS; i++) |
1247 | for (int i = 1; i < NUM_SKILLS; i++) |
1409 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
1248 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]); |
1410 | |
1249 | |
1411 | if (sl.length () >= MAXSOCKBUF) |
1250 | if (sl.length () > MAXSOCKBUF) |
1412 | { |
1251 | { |
1413 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
1252 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
1414 | fatal (0); |
1253 | fatal (0); |
1415 | } |
1254 | } |
1416 | |
1255 | |
… | |
… | |
1429 | sl << "replyinfo spell_paths\n"; |
1268 | sl << "replyinfo spell_paths\n"; |
1430 | |
1269 | |
1431 | for (int i = 0; i < NRSPELLPATHS; i++) |
1270 | for (int i = 0; i < NRSPELLPATHS; i++) |
1432 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
1271 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
1433 | |
1272 | |
1434 | if (sl.length () >= MAXSOCKBUF) |
1273 | if (sl.length () > MAXSOCKBUF) |
1435 | { |
1274 | { |
1436 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
1275 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
1437 | fatal (0); |
1276 | fatal (0); |
1438 | } |
1277 | } |
1439 | |
1278 | |
… | |
… | |
1458 | if (spell->type == SPELL) |
1297 | if (spell->type == SPELL) |
1459 | { |
1298 | { |
1460 | int flags = 0; |
1299 | int flags = 0; |
1461 | |
1300 | |
1462 | /* check if we need to update it */ |
1301 | /* check if we need to update it */ |
1463 | if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) |
1302 | if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) |
1464 | { |
1303 | { |
1465 | spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
1304 | spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
1466 | flags |= UPD_SP_MANA; |
1305 | flags |= UPD_SP_MANA; |
1467 | } |
1306 | } |
1468 | |
1307 | |
1469 | if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) |
1308 | if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) |
1470 | { |
1309 | { |
1471 | spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
1310 | spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
1472 | flags |= UPD_SP_GRACE; |
1311 | flags |= UPD_SP_GRACE; |
1473 | } |
1312 | } |
1474 | |
1313 | |
1475 | if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) |
1314 | if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) |
1476 | { |
1315 | { |
1477 | spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
1316 | spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
1478 | flags |= UPD_SP_DAMAGE; |
1317 | flags |= UPD_SP_DAMAGE; |
1479 | } |
1318 | } |
1480 | |
1319 | |
1481 | if (flags) |
1320 | if (flags) |
1482 | { |
1321 | { |
… | |
… | |
1484 | |
1323 | |
1485 | sl << "updspell " |
1324 | sl << "updspell " |
1486 | << uint8 (flags) |
1325 | << uint8 (flags) |
1487 | << uint32 (spell->count); |
1326 | << uint32 (spell->count); |
1488 | |
1327 | |
1489 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
1328 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); |
1490 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
1329 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); |
1491 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
1330 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); |
1492 | |
1331 | |
1493 | pl->ns->send_packet (sl); |
1332 | pl->ns->send_packet (sl); |
1494 | } |
1333 | } |
1495 | } |
1334 | } |
1496 | } |
1335 | } |
… | |
… | |
1526 | LOG (llevError, "item number %d is a spell with no name.\n", spell->count); |
1365 | LOG (llevError, "item number %d is a spell with no name.\n", spell->count); |
1527 | return; |
1366 | return; |
1528 | } |
1367 | } |
1529 | |
1368 | |
1530 | /* store costs and damage in the object struct, to compare to later */ |
1369 | /* store costs and damage in the object struct, to compare to later */ |
1531 | spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
1370 | spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
1532 | spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
1371 | spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
1533 | spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
1372 | spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
1534 | |
1373 | |
1535 | /* figure out which skill it uses, if it uses one */ |
1374 | /* figure out which skill it uses, if it uses one */ |
1536 | if (spell->skill) |
1375 | if (spell->skill) |
1537 | { |
1376 | if (object *tmp = pl->find_skill (spell->skill)) |
1538 | for (i = 1; i < NUM_SKILLS; i++) |
|
|
1539 | if (!strcmp (spell->skill, skill_names[i])) |
|
|
1540 | { |
|
|
1541 | skill = i + CS_STAT_SKILLINFO; |
1377 | skill = tmp->subtype + CS_STAT_SKILLINFO; |
1542 | break; |
|
|
1543 | } |
|
|
1544 | } |
|
|
1545 | |
1378 | |
1546 | // spells better have a face |
1379 | // spells better have a face |
1547 | if (!spell->face) |
1380 | if (!spell->face) |
1548 | { |
1381 | { |
1549 | LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); |
1382 | LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); |
1550 | spell->face = face_find ("burnout.x11", blank_face); |
1383 | spell->face = face_find ("burnout.x11", blank_face); |
1551 | } |
1384 | } |
|
|
1385 | |
|
|
1386 | pl->ns->send_face (spell->face); |
1552 | |
1387 | |
1553 | /* send the current values */ |
1388 | /* send the current values */ |
1554 | sl << uint32 (spell->count) |
1389 | sl << uint32 (spell->count) |
1555 | << uint16 (spell->level) |
1390 | << uint16 (spell->level) |
1556 | << uint16 (spell->casting_time) |
1391 | << uint16 (spell->casting_time) |
1557 | << uint16 (spell->last_sp) |
1392 | << uint16 (spell->cached_sp) |
1558 | << uint16 (spell->last_grace) |
1393 | << uint16 (spell->cached_grace) |
1559 | << uint16 (spell->last_eat) |
1394 | << uint16 (spell->cached_eat) |
1560 | << uint8 (skill) |
1395 | << uint8 (skill) |
1561 | << uint32 (spell->path_attuned) |
1396 | << uint32 (spell->path_attuned) |
1562 | << uint32 (spell->face) |
1397 | << uint32 (spell->face) |
1563 | << data8 (spell->name) |
1398 | << data8 (spell->name) |
1564 | << data16 (spell->msg); |
1399 | << data16 (spell->msg); |
… | |
… | |
1592 | * bytes and 3 strings (because that is the spec) so we need to |
1427 | * bytes and 3 strings (because that is the spec) so we need to |
1593 | * check that the length of those 3 strings, plus the 23 bytes, |
1428 | * check that the length of those 3 strings, plus the 23 bytes, |
1594 | * won't take us over the length limit for the socket, if it does, |
1429 | * won't take us over the length limit for the socket, if it does, |
1595 | * we need to send what we already have, and restart packet formation |
1430 | * we need to send what we already have, and restart packet formation |
1596 | */ |
1431 | */ |
|
|
1432 | if (spell->type != SPELL) |
|
|
1433 | continue; |
|
|
1434 | |
1597 | /* Seeing crashes by overflowed buffers. Quick arithemetic seems |
1435 | /* Seeing crashes by overflowed buffers. Quick arithemetic seems |
1598 | * to show add_spell is 26 bytes + 2 strings. However, the overun |
1436 | * to show add_spell is 26 bytes + 2 strings. However, the overun |
1599 | * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem |
1437 | * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem |
1600 | * like it will fix this |
1438 | * like it will fix this |
1601 | */ |
1439 | */ |
1602 | if (spell->type != SPELL) |
|
|
1603 | continue; |
|
|
1604 | |
|
|
1605 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
1440 | if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
1606 | { |
1441 | { |
|
|
1442 | pl->ns->flush_fx (); |
1607 | pl->ns->send_packet (sl); |
1443 | pl->ns->send_packet (sl); |
1608 | |
1444 | |
1609 | sl.reset (); |
1445 | sl.reset (); |
1610 | sl << "addspell "; |
1446 | sl << "addspell "; |
1611 | } |
1447 | } |
… | |
… | |
1619 | return; |
1455 | return; |
1620 | } |
1456 | } |
1621 | else |
1457 | else |
1622 | append_spell (pl, sl, spell); |
1458 | append_spell (pl, sl, spell); |
1623 | |
1459 | |
1624 | if (sl.length () >= MAXSOCKBUF) |
1460 | if (sl.length () > MAXSOCKBUF) |
1625 | { |
1461 | { |
1626 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
1462 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
1627 | fatal (0); |
1463 | fatal (0); |
1628 | } |
1464 | } |
1629 | |
1465 | |
1630 | /* finally, we can send the packet */ |
1466 | /* finally, we can send the packet */ |
|
|
1467 | pl->ns->flush_fx (); |
1631 | pl->ns->send_packet (sl); |
1468 | pl->ns->send_packet (sl); |
1632 | } |
1469 | } |
1633 | |
1470 | |
|
|
1471 | //-GPL |
|
|
1472 | |