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 |
9 | * under the terms of the GNU General Public License as published by the Free |
9 | * it under the terms of the GNU General Public License as published by |
10 | * Software Foundation; either version 2 of the License, or (at your option) |
10 | * the Free Software Foundation, either version 3 of the License, or |
11 | * 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, 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 GNU General Public License |
19 | * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
20 | * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
|
|
21 | * |
20 | * |
22 | * 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> |
23 | */ |
22 | */ |
24 | |
23 | |
25 | /** |
24 | /** |
26 | * \file |
25 | * \file |
27 | * Client handling. |
26 | * Client handling. |
… | |
… | |
99 | */ |
98 | */ |
100 | mx = ns->mapx; |
99 | mx = ns->mapx; |
101 | my = ns->mapy; |
100 | my = ns->mapy; |
102 | |
101 | |
103 | /* 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 |
104 | * (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, |
105 | * if the destination x or y coordinate is outside the viewable |
104 | * if the destination x or y coordinate is outside the viewable |
106 | * area, we clear the values - otherwise, the old values |
105 | * area, we clear the values - otherwise, the old values |
107 | * 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. |
108 | */ |
107 | */ |
109 | for (x = 0; x < mx; x++) |
108 | for (x = 0; x < mx; x++) |
110 | { |
|
|
111 | for (y = 0; y < my; y++) |
109 | for (y = 0; y < my; y++) |
112 | { |
|
|
113 | if (x >= ns->mapx || y >= ns->mapy) |
110 | if (x >= ns->mapx || y >= ns->mapy) |
114 | /* clear cells outside the viewable area */ |
111 | /* clear cells outside the viewable area */ |
115 | memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); |
112 | 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) |
113 | 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 */ |
114 | /* clear newly visible tiles within the viewable area */ |
118 | memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); |
115 | memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); |
119 | else |
116 | else |
120 | 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)); |
121 | } |
|
|
122 | } |
|
|
123 | |
118 | |
124 | memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); |
119 | memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); |
125 | |
120 | |
126 | /* 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 |
127 | * empty). |
122 | * empty). |
… | |
… | |
130 | } |
125 | } |
131 | |
126 | |
132 | static void |
127 | static void |
133 | clear_map (player *pl) |
128 | clear_map (player *pl) |
134 | { |
129 | { |
|
|
130 | pl->ns->mapinfo_queue_clear (); |
|
|
131 | |
135 | memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); |
132 | memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); |
136 | |
133 | |
137 | pl->ns->force_newmap = false; |
134 | pl->ns->force_newmap = false; |
138 | |
135 | |
139 | if (pl->ns->newmapcmd == 1) |
136 | if (pl->ns->newmapcmd == 1) |
140 | pl->ns->send_packet ("newmap"); |
137 | pl->ns->send_packet ("newmap"); |
141 | |
138 | |
142 | pl->ns->floorbox_reset (); |
139 | pl->ns->floorbox_reset (); |
|
|
140 | } |
|
|
141 | |
|
|
142 | static void |
|
|
143 | send_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 | } |
143 | } |
166 | } |
144 | |
167 | |
145 | /** check for map/region change and send new map data */ |
168 | /** check for map/region change and send new map data */ |
146 | static void |
169 | static void |
147 | check_map_change (player *pl) |
170 | check_map_change (player *pl) |
148 | { |
171 | { |
149 | client &socket = *pl->ns; |
172 | client &socket = *pl->ns; |
150 | object *ob = pl->observe; |
173 | object *ob = pl->observe; |
151 | |
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 | |
152 | if (socket.current_map != ob->map || socket.force_newmap) |
202 | if (socket.current_map != ob->map || socket.force_newmap) |
153 | { |
203 | { |
154 | clear_map (pl); |
204 | clear_map (pl); |
155 | socket.current_map = ob->map; |
205 | socket.current_map = ob->map; |
156 | |
206 | 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 | } |
207 | } |
176 | 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) |
177 | { |
209 | { |
178 | int dx = ob->x - socket.current_x; |
210 | int dx = ob->x - socket.current_x; |
179 | int dy = ob->y - socket.current_y; |
211 | int dy = ob->y - socket.current_y; |
… | |
… | |
187 | } |
219 | } |
188 | } |
220 | } |
189 | |
221 | |
190 | socket.current_x = ob->x; |
222 | socket.current_x = ob->x; |
191 | socket.current_y = ob->y; |
223 | 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 | } |
224 | } |
200 | |
225 | |
201 | /** |
226 | /** |
202 | * RequestInfo is sort of a meta command. There is some specific |
227 | * RequestInfo is sort of a meta command. There is some specific |
203 | * request of information, but we call other functions to provide |
228 | * request of information, but we call other functions to provide |
204 | * that information. |
229 | * that information. |
205 | */ |
230 | */ |
206 | void |
231 | void |
207 | RequestInfo (char *buf, int len, client * ns) |
232 | RequestInfo (char *buf, int len, client *ns) |
208 | { |
233 | { |
209 | char *params = NULL, *cp; |
234 | 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 | |
235 | |
222 | /* find the first space, make it null, and update the |
236 | /* find the first space, make it null, and update the |
223 | * params pointer. |
237 | * params pointer. |
224 | */ |
238 | */ |
225 | for (cp = buf; *cp != '\0'; cp++) |
239 | for (params = buf; *params; params++) |
226 | if (*cp == ' ') |
240 | if (*params == ' ') |
227 | { |
241 | { |
228 | *cp = '\0'; |
|
|
229 | params = cp + 1; |
242 | *params++ = 0; |
230 | break; |
243 | break; |
231 | } |
244 | } |
232 | |
245 | |
233 | if (!strcmp (buf, "image_info")) |
246 | if (!strcmp (buf, "image_info")) |
234 | send_image_info (ns, params); |
247 | send_image_info (ns, params); |
… | |
… | |
237 | else if (!strcmp (buf, "skill_info")) |
250 | else if (!strcmp (buf, "skill_info")) |
238 | send_skill_info (ns, params); |
251 | send_skill_info (ns, params); |
239 | else if (!strcmp (buf, "spell_paths")) |
252 | else if (!strcmp (buf, "spell_paths")) |
240 | send_spell_paths (ns, params); |
253 | send_spell_paths (ns, params); |
241 | else |
254 | else |
242 | ns->send_packet (bigbuf, len); |
255 | { |
|
|
256 | // undo tokenisation above and send replyinfo with the request unchanged |
|
|
257 | if (*params) |
|
|
258 | *--params = ' '; |
|
|
259 | |
|
|
260 | ns->send_packet_printf ("replyinfo %s", buf); |
|
|
261 | } |
243 | } |
262 | } |
244 | |
263 | |
245 | void |
264 | void |
246 | ExtCmd (char *buf, int len, player *pl) |
265 | ExtCmd (char *buf, int len, player *pl) |
247 | { |
266 | { |
… | |
… | |
250 | |
269 | |
251 | void |
270 | void |
252 | ExtiCmd (char *buf, int len, client *ns) |
271 | ExtiCmd (char *buf, int len, client *ns) |
253 | { |
272 | { |
254 | INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); |
273 | INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); |
|
|
274 | } |
|
|
275 | |
|
|
276 | void |
|
|
277 | client::mapinfo_queue_clear () |
|
|
278 | { |
|
|
279 | for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) |
|
|
280 | free (*i); |
|
|
281 | |
|
|
282 | mapinfo_queue.clear (); |
|
|
283 | } |
|
|
284 | |
|
|
285 | bool |
|
|
286 | client::mapinfo_try (char *buf) |
|
|
287 | { |
|
|
288 | char *token = buf; |
|
|
289 | buf += strlen (buf) + 9; |
|
|
290 | |
|
|
291 | // initial map and its origin |
|
|
292 | maptile *map = pl->observe->map; |
|
|
293 | int mapx = pl->ns->mapx / 2 - pl->observe->x; |
|
|
294 | int mapy = pl->ns->mapy / 2 - pl->observe->y; |
|
|
295 | int max_distance = 8; // limit maximum path length to something generous |
|
|
296 | |
|
|
297 | while (*buf && map && max_distance) |
|
|
298 | { |
|
|
299 | int dir = *buf++ - '1'; |
|
|
300 | |
|
|
301 | if (dir >= 0 && dir <= 3) |
|
|
302 | { |
|
|
303 | if (!map->tile_path [dir]) |
|
|
304 | map = 0; |
|
|
305 | else if (map->tile_available (dir, false)) |
|
|
306 | { |
|
|
307 | maptile *neigh = map->tile_map [dir]; |
|
|
308 | |
|
|
309 | switch (dir) |
|
|
310 | { |
|
|
311 | case 0: mapy -= neigh->height; break; |
|
|
312 | case 2: mapy += map ->height; break; |
|
|
313 | case 3: mapx -= neigh->width ; break; |
|
|
314 | case 1: mapx += map ->width ; break; |
|
|
315 | } |
|
|
316 | |
|
|
317 | map = neigh; |
|
|
318 | --max_distance; |
|
|
319 | } |
|
|
320 | else |
|
|
321 | return 0; |
|
|
322 | } |
|
|
323 | else |
|
|
324 | max_distance = 0; |
|
|
325 | } |
|
|
326 | |
|
|
327 | if (!max_distance) |
|
|
328 | send_packet_printf ("mapinfo %s error", token); |
|
|
329 | else if (!map || !map->path) |
|
|
330 | send_packet_printf ("mapinfo %s nomap", token); |
|
|
331 | else |
|
|
332 | { |
|
|
333 | int flags = 0; |
|
|
334 | |
|
|
335 | if (map->tile_path[0]) flags |= 1; |
|
|
336 | if (map->tile_path[1]) flags |= 2; |
|
|
337 | if (map->tile_path[2]) flags |= 4; |
|
|
338 | if (map->tile_path[3]) flags |= 8; |
|
|
339 | |
|
|
340 | send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); |
|
|
341 | } |
|
|
342 | |
|
|
343 | return 1; |
|
|
344 | } |
|
|
345 | |
|
|
346 | void |
|
|
347 | client::mapinfo_queue_run () |
|
|
348 | { |
|
|
349 | if (mapinfo_queue.empty () || !pl) |
|
|
350 | return; |
|
|
351 | |
|
|
352 | for (int i = 0; i < mapinfo_queue.size (); ++i) |
|
|
353 | if (mapinfo_try (mapinfo_queue [i])) |
|
|
354 | { |
|
|
355 | free (mapinfo_queue [i]); |
|
|
356 | mapinfo_queue.erase (i); |
|
|
357 | } |
|
|
358 | else |
|
|
359 | ++i; |
255 | } |
360 | } |
256 | |
361 | |
257 | void |
362 | void |
258 | MapInfoCmd (char *buf, int len, player *pl) |
363 | MapInfoCmd (char *buf, int len, player *pl) |
259 | { |
364 | { |
260 | // <mapinfo tag spatial tile-path |
365 | // <mapinfo tag spatial tile-path |
261 | // >mapinfo tag spatial flags x y w h hash |
366 | // >mapinfo tag spatial flags x y w h hash |
262 | |
367 | |
263 | char bigbuf[MAX_BUF], *token; |
|
|
264 | |
|
|
265 | token = buf; |
368 | char *token = buf; |
266 | // copy token |
369 | |
267 | if (!(buf = strchr (buf, ' '))) |
370 | if (!(buf = strchr (buf, ' '))) |
268 | return; |
371 | return; |
269 | |
372 | |
270 | *buf++ = 0; |
|
|
271 | |
|
|
272 | if (!strncmp (buf, "spatial ", 8)) |
373 | if (!strncmp (buf, " spatial ", 9)) |
273 | { |
374 | { |
274 | buf += 8; |
375 | char *copy = strdup (token); |
|
|
376 | copy [buf - token] = 0; |
275 | |
377 | |
276 | // initial map and its origin |
378 | #if 0 |
277 | maptile *map = pl->ob->map; |
379 | // this makes only sense when we flush the buffer immediately |
278 | sint16 dx, dy; |
380 | if (pl->ns->mapinfo_try (copy)) |
279 | int mapx = pl->ns->mapx / 2 - pl->ob->x; |
381 | 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 |
382 | else |
332 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
383 | #endif |
|
|
384 | pl->ns->mapinfo_queue.push_back (copy); |
333 | } |
385 | } |
334 | else |
386 | else |
335 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
387 | pl->ns->send_packet_printf ("mapinfo %s unsupported", token); |
336 | |
|
|
337 | pl->ns->send_packet (bigbuf); |
|
|
338 | } |
388 | } |
339 | |
389 | |
340 | /** This is the Setup cmd */ |
390 | /** This is the Setup cmd */ |
341 | void |
391 | void |
342 | SetUp (char *buf, int len, client * ns) |
392 | SetUp (char *buf, int len, client * ns) |
… | |
… | |
352 | */ |
402 | */ |
353 | void |
403 | void |
354 | AddMeCmd (char *buf, int len, client *ns) |
404 | AddMeCmd (char *buf, int len, client *ns) |
355 | { |
405 | { |
356 | INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); |
406 | INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); |
357 | } |
|
|
358 | |
|
|
359 | /** Reply to ExtendedInfos command */ |
|
|
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 | } |
407 | } |
411 | |
408 | |
412 | /* |
409 | /* |
413 | #define MSG_TYPE_BOOK 1 |
410 | #define MSG_TYPE_BOOK 1 |
414 | #define MSG_TYPE_CARD 2 |
411 | #define MSG_TYPE_CARD 2 |
… | |
… | |
471 | |
468 | |
472 | ns->send_packet (cmdback); |
469 | ns->send_packet (cmdback); |
473 | } |
470 | } |
474 | |
471 | |
475 | /** |
472 | /** |
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, |
473 | * This handles the general commands from the client (ie, north, fire, cast, |
498 | * etc.) |
474 | * etc.) |
499 | */ |
475 | */ |
500 | void |
476 | void |
501 | PlayerCmd (char *buf, int len, player *pl) |
477 | PlayerCmd (char *buf, int len, player *pl) |
… | |
… | |
522 | * commands. |
498 | * commands. |
523 | */ |
499 | */ |
524 | pl->count = 0; |
500 | pl->count = 0; |
525 | } |
501 | } |
526 | |
502 | |
527 | |
|
|
528 | /** |
503 | /** |
529 | * This handles the general commands from the client (ie, north, fire, cast, |
504 | * This handles the general commands from the client (ie, north, fire, cast, |
530 | * etc.). It is a lot like PlayerCmd above, but is called with the |
505 | * etc.). It is a lot like PlayerCmd above, but is called with the |
531 | * 'ncom' method which gives more information back to the client so it |
506 | * 'ncom' method which gives more information back to the client so it |
532 | * can throttle. |
507 | * can throttle. |
… | |
… | |
534 | void |
509 | void |
535 | NewPlayerCmd (char *buf, int len, player *pl) |
510 | NewPlayerCmd (char *buf, int len, player *pl) |
536 | { |
511 | { |
537 | if (len <= 6) |
512 | if (len <= 6) |
538 | { |
513 | { |
539 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
514 | LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len); |
540 | return; |
515 | return; |
541 | } |
516 | } |
542 | |
517 | |
543 | uint16 cmdid = net_uint16 ((uint8 *)buf); |
518 | uint16 cmdid = net_uint16 ((uint8 *)buf); |
544 | sint32 repeat = net_sint32 ((uint8 *)buf + 2); |
519 | sint32 repeat = net_sint32 ((uint8 *)buf + 2); |
… | |
… | |
682 | * syntax is: move (to) (tag) (nrof) |
657 | * syntax is: move (to) (tag) (nrof) |
683 | */ |
658 | */ |
684 | void |
659 | void |
685 | MoveCmd (char *buf, int len, player *pl) |
660 | MoveCmd (char *buf, int len, player *pl) |
686 | { |
661 | { |
687 | int vals[3], i; |
662 | int to, tag, nrof; |
688 | |
663 | |
689 | /* A little funky here. We only cycle for 2 records, because |
664 | if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof)) |
690 | * we obviously are not going to find a space after the third |
|
|
691 | * record. Perhaps we should just replace this with a |
|
|
692 | * sscanf? |
|
|
693 | */ |
|
|
694 | for (i = 0; i < 2; i++) |
|
|
695 | { |
665 | { |
696 | vals[i] = atoi (buf); |
|
|
697 | |
|
|
698 | if (!(buf = strchr (buf, ' '))) |
|
|
699 | { |
|
|
700 | LOG (llevError, "Incomplete move command: %s\n", buf); |
666 | LOG (llevError, "Incomplete move command: %s\n", buf); |
701 | return; |
667 | return; |
702 | } |
|
|
703 | |
|
|
704 | buf++; |
|
|
705 | } |
668 | } |
706 | |
669 | |
707 | vals[2] = atoi (buf); |
670 | esrv_move_object (pl->ob, to, tag, nrof); |
708 | |
|
|
709 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
|
|
710 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
|
|
711 | } |
671 | } |
712 | |
672 | |
713 | /****************************************************************************** |
673 | /****************************************************************************** |
714 | * |
674 | * |
715 | * Start of commands the server sends to the client. |
675 | * Start of commands the server sends to the client. |
… | |
… | |
738 | buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; |
698 | buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; |
739 | |
699 | |
740 | if (pl->combat_ob) |
700 | if (pl->combat_ob) |
741 | buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; |
701 | buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; |
742 | |
702 | |
|
|
703 | #if 0 |
743 | //TODO: remove this when slot system is working, this is only for debugging |
704 | //TODO: remove this when slot system is working, this is only for debugging |
744 | if (pl->ob->chosen_skill) |
705 | if (pl->ob->chosen_skill) |
745 | buf << " Skill*: " << pl->ob->chosen_skill->name; |
706 | buf << " Skill*: " << pl->ob->chosen_skill->name; |
|
|
707 | #endif |
746 | |
708 | |
747 | //TODO: maybe golem should become the current_weapon, quite simply? |
709 | //TODO: maybe golem should become the current_weapon, quite simply? |
748 | if (pl->golem) |
710 | if (pl->golem) |
749 | buf << " Golem*: " << pl->golem->name; |
711 | buf << " Golem*: " << pl->golem->name; |
750 | |
712 | |
|
|
713 | buf << '\0'; |
751 | buf.linearise (obuf); |
714 | buf.linearise (obuf); |
752 | obuf [buf.size ()] = 0; |
|
|
753 | } |
715 | } |
754 | |
716 | |
755 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
717 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
756 | Old = New; \ |
718 | Old = New; \ |
757 | sl << uint8 (Type) << uint64 (New); \ |
719 | sl << uint8 (Type) << uint64 (New); \ |
… | |
… | |
794 | return; |
756 | return; |
795 | |
757 | |
796 | object *ob = pl->observe; |
758 | object *ob = pl->observe; |
797 | if (!ob) |
759 | if (!ob) |
798 | return; |
760 | return; |
|
|
761 | |
|
|
762 | player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl; |
799 | |
763 | |
800 | packet sl ("stats"); |
764 | packet sl ("stats"); |
801 | |
765 | |
802 | AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); |
766 | AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); |
803 | AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); |
767 | AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); |
… | |
… | |
812 | AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); |
776 | AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); |
813 | AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); |
777 | AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); |
814 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
778 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
815 | |
779 | |
816 | for (int s = 0; s < NUM_SKILLS; s++) |
780 | for (int s = 0; s < NUM_SKILLS; s++) |
817 | if (object *skill = pl->last_skill_ob[s]) |
781 | if (object *skill = opl->last_skill_ob [s]) |
818 | if (skill->stats.exp != ns->last_skill_exp [s]) |
782 | if (skill->stats.exp != ns->last_skill_exp [s]) |
819 | { |
783 | { |
820 | ns->last_skill_exp [s] = skill->stats.exp; |
784 | ns->last_skill_exp [s] = skill->stats.exp; |
821 | |
785 | |
822 | /* Always send along the level if exp changes. This is only |
786 | /* Always send along the level if exp changes. This is only |
… | |
… | |
837 | AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); |
801 | AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); |
838 | AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); |
802 | AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); |
839 | |
803 | |
840 | flags = 0; |
804 | flags = 0; |
841 | |
805 | |
842 | if (pl->fire_on) |
806 | if (opl->fire_on) |
843 | flags |= SF_FIREON; |
807 | flags |= SF_FIREON; |
844 | |
808 | |
845 | if (pl->run_on) |
809 | if (opl->run_on) |
846 | flags |= SF_RUNON; |
810 | flags |= SF_RUNON; |
847 | |
811 | |
848 | AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); |
812 | AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); |
849 | |
813 | |
850 | if (ns->sc_version < 1025) |
814 | if (ns->sc_version < 1025) |
… | |
… | |
864 | AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
828 | AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
865 | AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); |
829 | AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); |
866 | AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); |
830 | AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); |
867 | } |
831 | } |
868 | |
832 | |
869 | rangetostring (pl, buf); /* we want use the new fire & run system in new client */ |
833 | rangetostring (opl, buf); /* we want use the new fire & run system in new client */ |
870 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
834 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
871 | set_title (ob, buf); |
835 | set_title (ob, buf); |
872 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
836 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
873 | |
837 | |
874 | /* Only send it away if we have some actual data */ |
838 | /* Only send it away if we have some actual data */ |
… | |
… | |
878 | |
842 | |
879 | /** |
843 | /** |
880 | * Tells the client that here is a player it should start using. |
844 | * Tells the client that here is a player it should start using. |
881 | */ |
845 | */ |
882 | void |
846 | void |
883 | esrv_new_player (player *pl, uint32 weight) |
847 | esrv_new_player (player *pl) |
884 | { |
848 | { |
|
|
849 | sint32 weight = pl->ob->client_weight (); |
|
|
850 | |
885 | packet sl ("player"); |
851 | packet sl ("player"); |
886 | |
852 | |
887 | sl << uint32 (pl->ob->count) |
853 | sl << uint32 (pl->ob->count) |
888 | << uint32 (weight) |
854 | << uint32 (weight) |
889 | << uint32 (pl->ob->face) |
855 | << uint32 (pl->ob->face) |
890 | << data8 (pl->ob->name); |
856 | << data8 (pl->ob->name); |
891 | |
857 | |
892 | pl->ns->last_weight = weight; |
858 | pl->ns->last_weight = weight; |
893 | pl->ns->send_packet (sl); |
859 | pl->ns->send_packet (sl); |
894 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
|
|
895 | } |
860 | } |
896 | |
861 | |
897 | /****************************************************************************** |
862 | /****************************************************************************** |
898 | * |
863 | * |
899 | * Start of map related commands. |
864 | * Start of map related commands. |
… | |
… | |
956 | |
921 | |
957 | if (!ns.faces_sent[face_num]) |
922 | if (!ns.faces_sent[face_num]) |
958 | if (ob) |
923 | if (ob) |
959 | ns.send_faces (ob); |
924 | ns.send_faces (ob); |
960 | else |
925 | else |
961 | ns.send_face (face_num); |
926 | ns.send_face (face_num, 10); |
962 | |
927 | |
963 | sl << uint16 (face_num); |
928 | sl << uint16 (face_num); |
964 | return 1; |
929 | return 1; |
965 | } |
930 | } |
966 | |
931 | |
967 | /* Nothing changed */ |
932 | /* Nothing changed */ |
968 | return 0; |
933 | return 0; |
969 | } |
|
|
970 | |
|
|
971 | /** |
|
|
972 | * Returns the size of a data for a map square as returned by |
|
|
973 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
|
|
974 | * available. |
|
|
975 | */ |
|
|
976 | int |
|
|
977 | getExtendedMapInfoSize (client * ns) |
|
|
978 | { |
|
|
979 | int result = 0; |
|
|
980 | |
|
|
981 | if (ns->ext_mapinfos) |
|
|
982 | { |
|
|
983 | if (ns->EMI_smooth) |
|
|
984 | result += 1; /*One byte for smoothlevel */ |
|
|
985 | } |
|
|
986 | |
|
|
987 | return result; |
|
|
988 | } |
934 | } |
989 | |
935 | |
990 | // prefetch (and touch) all maps within a specific distancd |
936 | // prefetch (and touch) all maps within a specific distancd |
991 | static void |
937 | static void |
992 | prefetch_surrounding_maps (maptile *map, int distance) |
938 | prefetch_surrounding_maps (maptile *map, int distance) |
… | |
… | |
1017 | { |
963 | { |
1018 | object *ob = pl->observe; |
964 | object *ob = pl->observe; |
1019 | if (!ob->active) |
965 | if (!ob->active) |
1020 | return; |
966 | return; |
1021 | |
967 | |
1022 | maptile *plmap = ob->map; |
|
|
1023 | |
|
|
1024 | /* If player is just joining the game, he isn't here yet, so the map |
968 | /* If player is just joining the game, he isn't here yet, so the map |
1025 | * can get swapped out. If so, don't try to send them a map. All will |
969 | * can get swapped out. If so, don't try to send them a map. All will |
1026 | * be OK once they really log in. |
970 | * be OK once they really log in. |
1027 | */ |
971 | */ |
1028 | if (!plmap || plmap->in_memory != MAP_IN_MEMORY) |
972 | if (!ob->map || ob->map->in_memory != MAP_ACTIVE) |
1029 | return; |
973 | return; |
1030 | |
974 | |
1031 | int x, y, ax, ay, startlen, max_x, max_y, oldlen; |
|
|
1032 | sint16 nx, ny; |
|
|
1033 | int estartlen, eoldlen; |
975 | int startlen, oldlen; |
1034 | uint8 eentrysize; |
|
|
1035 | uint16 ewhatstart, ewhatflag; |
|
|
1036 | uint8 extendedinfos; |
|
|
1037 | maptile *m; |
|
|
1038 | |
976 | |
1039 | check_map_change (pl); |
977 | check_map_change (pl); |
1040 | prefetch_surrounding_maps (pl->ob); |
978 | prefetch_surrounding_maps (pl->ob); |
1041 | |
979 | |
1042 | /* do LOS after calls to update_position */ |
980 | /* do LOS after calls to update_position */ |
1043 | if (ob != pl->ob) |
981 | /* unfortunately, we need to udpate los when observing, currently */ |
1044 | clear_los (pl); |
982 | if (pl->do_los || pl->observe != pl->ob) |
1045 | else if (pl->do_los) |
|
|
1046 | { |
983 | { |
1047 | update_los (ob); |
|
|
1048 | pl->do_los = 0; |
984 | pl->do_los = 0; |
|
|
985 | pl->update_los (); |
1049 | } |
986 | } |
1050 | |
987 | |
1051 | /** |
988 | /** |
1052 | * This function uses the new map1 protocol command to send the map |
989 | * This function uses the new map1 protocol command to send the map |
1053 | * to the client. It is necessary because the old map command supports |
990 | * to the client. It is necessary because the old map command supports |
… | |
… | |
1072 | */ |
1009 | */ |
1073 | |
1010 | |
1074 | client &socket = *pl->ns; |
1011 | client &socket = *pl->ns; |
1075 | |
1012 | |
1076 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1013 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1077 | packet esl; |
|
|
1078 | |
1014 | |
1079 | startlen = sl.length (); |
1015 | startlen = sl.length (); |
1080 | |
1016 | |
1081 | /*Extendedmapinfo structure initialisation */ |
1017 | int hx = socket.mapx / 2; |
1082 | if (socket.ext_mapinfos) |
1018 | int hy = socket.mapy / 2; |
1083 | { |
|
|
1084 | extendedinfos = EMI_NOREDRAW; |
|
|
1085 | |
1019 | |
1086 | if (socket.EMI_smooth) |
1020 | ordered_mapwalk_begin (ob, -hx, -hy, hx, hy) |
1087 | extendedinfos |= EMI_SMOOTH; |
1021 | int ax = dx + hx; |
|
|
1022 | int ay = dy + hy; |
1088 | |
1023 | |
1089 | ewhatstart = esl.length (); |
1024 | int mask = (ax << 10) | (ay << 4); |
1090 | ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit |
|
|
1091 | could need to be taken away */ |
|
|
1092 | eentrysize = getExtendedMapInfoSize (&socket); |
|
|
1093 | esl << "mapextended " |
|
|
1094 | << uint8 (extendedinfos) |
|
|
1095 | << uint8 (eentrysize); |
|
|
1096 | |
|
|
1097 | estartlen = esl.length (); |
|
|
1098 | } |
|
|
1099 | |
|
|
1100 | /* x,y are the real map locations. ax, ay are viewport relative |
|
|
1101 | * locations. |
|
|
1102 | */ |
|
|
1103 | ay = 0; |
|
|
1104 | |
|
|
1105 | /* We could do this logic as conditionals in the if statement, |
|
|
1106 | * but that started to get a bit messy to look at. |
|
|
1107 | */ |
|
|
1108 | max_x = ob->x + (socket.mapx + 1) / 2; |
|
|
1109 | max_y = ob->y + (socket.mapy + 1) / 2; |
|
|
1110 | |
|
|
1111 | for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++) |
|
|
1112 | { |
|
|
1113 | ax = 0; |
|
|
1114 | for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) |
|
|
1115 | { |
|
|
1116 | int emask, mask; |
|
|
1117 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
|
|
1118 | |
|
|
1119 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1025 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1120 | |
1026 | |
1121 | /* If the coordinates are not valid, or it is too dark to see, |
1027 | /* If the coordinates are not valid, or it is too dark to see, |
1122 | * we tell the client as such |
1028 | * we tell the client as such |
1123 | */ |
1029 | */ |
1124 | nx = x; |
|
|
1125 | ny = y; |
|
|
1126 | m = get_map_from_coord (plmap, &nx, &ny); |
|
|
1127 | |
|
|
1128 | if (!m) |
1030 | if (!m) |
1129 | { |
1031 | { |
1130 | /* space is out of map. Update space and clear values |
1032 | /* space is out of map. Update space and clear values |
1131 | * if this hasn't already been done. If the space is out |
1033 | * if this hasn't already been done. If the space is out |
1132 | * of the map, it shouldn't have a head |
1034 | * of the map, it shouldn't have a head. |
1133 | */ |
1035 | */ |
1134 | if (lastcell.count != -1) |
1036 | if (lastcell.count != -1) |
|
|
1037 | { |
|
|
1038 | sl << uint16 (mask); |
|
|
1039 | map_clearcell (&lastcell, -1); |
|
|
1040 | } |
|
|
1041 | |
|
|
1042 | continue; |
|
|
1043 | } |
|
|
1044 | |
|
|
1045 | int d = pl->blocked_los_uc (dx, dy); |
|
|
1046 | |
|
|
1047 | if (d > 3) |
|
|
1048 | { |
|
|
1049 | /* This block deals with spaces that are not visible for whatever |
|
|
1050 | * reason. Still may need to send the head for this space. |
|
|
1051 | */ |
|
|
1052 | if (lastcell.count != -1 |
|
|
1053 | || lastcell.faces[0] |
|
|
1054 | || lastcell.faces[1] |
|
|
1055 | || lastcell.faces[2] |
|
|
1056 | || lastcell.stat_hp |
|
|
1057 | || lastcell.flags |
|
|
1058 | || lastcell.player) |
|
|
1059 | sl << uint16 (mask); |
|
|
1060 | |
|
|
1061 | /* properly clear a previously sent big face */ |
|
|
1062 | map_clearcell (&lastcell, -1); |
|
|
1063 | } |
|
|
1064 | else |
|
|
1065 | { |
|
|
1066 | /* In this block, the space is visible. |
|
|
1067 | */ |
|
|
1068 | |
|
|
1069 | /* Rather than try to figure out what everything that we might |
|
|
1070 | * need to send is, then form the packet after that, |
|
|
1071 | * we presume that we will in fact form a packet, and update |
|
|
1072 | * the bits by what we do actually send. If we send nothing, |
|
|
1073 | * we just back out sl.length () to the old value, and no harm |
|
|
1074 | * is done. |
|
|
1075 | * I think this is simpler than doing a bunch of checks to see |
|
|
1076 | * what if anything we need to send, setting the bits, then |
|
|
1077 | * doing those checks again to add the real data. |
|
|
1078 | */ |
|
|
1079 | oldlen = sl.length (); |
|
|
1080 | |
|
|
1081 | sl << uint16 (mask); |
|
|
1082 | |
|
|
1083 | unsigned char dummy; |
|
|
1084 | unsigned char *last_ext = &dummy; |
|
|
1085 | |
|
|
1086 | /* Darkness changed */ |
|
|
1087 | if (lastcell.count != d && socket.darkness) |
|
|
1088 | { |
|
|
1089 | mask |= 0x8; |
|
|
1090 | |
|
|
1091 | if (socket.extmap) |
|
|
1092 | { |
|
|
1093 | *last_ext |= 0x80; |
|
|
1094 | last_ext = &sl[sl.length ()]; |
|
|
1095 | sl << uint8 (d); |
|
|
1096 | } |
|
|
1097 | else |
|
|
1098 | sl << uint8 (255 - 64 * d); |
|
|
1099 | } |
|
|
1100 | |
|
|
1101 | lastcell.count = d; |
|
|
1102 | |
|
|
1103 | mapspace &ms = m->at (nx, ny); |
|
|
1104 | ms.update (); |
|
|
1105 | |
|
|
1106 | if (expect_true (socket.extmap)) |
|
|
1107 | { |
|
|
1108 | uint8 stat_hp = 0; |
|
|
1109 | uint8 stat_width = 0; |
|
|
1110 | uint8 flags = 0; |
|
|
1111 | tag_t player = 0; |
|
|
1112 | |
|
|
1113 | // send hp information, if applicable |
|
|
1114 | if (object *op = ms.faces_obj [0]) |
|
|
1115 | if (op->is_head () && !op->invisible) |
1135 | { |
1116 | { |
1136 | sl << uint16 (mask); |
1117 | if (op->stats.maxhp > op->stats.hp |
1137 | map_clearcell (&lastcell, -1); |
1118 | && op->stats.maxhp > 0 |
|
|
1119 | && (op->type == PLAYER |
|
|
1120 | || op->type == DOOR // does not work, have maxhp 0 |
|
|
1121 | || QUERY_FLAG (op, FLAG_MONSTER) |
|
|
1122 | || QUERY_FLAG (op, FLAG_ALIVE) |
|
|
1123 | || QUERY_FLAG (op, FLAG_GENERATOR))) |
|
|
1124 | { |
|
|
1125 | stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; |
|
|
1126 | stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge |
|
|
1127 | } |
|
|
1128 | |
|
|
1129 | if (expect_false (op->has_dialogue ())) |
|
|
1130 | flags |= 1; |
|
|
1131 | |
|
|
1132 | if (expect_false (op->type == PLAYER)) |
|
|
1133 | player = op == ob ? pl->ob->count |
|
|
1134 | : op == pl->ob ? ob->count |
|
|
1135 | : op->count; |
1138 | } |
1136 | } |
1139 | |
1137 | |
1140 | continue; |
1138 | if (expect_false (lastcell.stat_hp != stat_hp)) |
1141 | } |
|
|
1142 | |
|
|
1143 | m->touch (); |
|
|
1144 | |
|
|
1145 | int d = pl->blocked_los[ax][ay]; |
|
|
1146 | |
|
|
1147 | if (d > 3) |
|
|
1148 | { |
|
|
1149 | |
|
|
1150 | int need_send = 0, count; |
|
|
1151 | |
|
|
1152 | /* This block deals with spaces that are not visible for whatever |
|
|
1153 | * reason. Still may need to send the head for this space. |
|
|
1154 | */ |
|
|
1155 | |
|
|
1156 | oldlen = sl.length (); |
|
|
1157 | |
|
|
1158 | sl << uint16 (mask); |
|
|
1159 | |
|
|
1160 | if (lastcell.count != -1) |
|
|
1161 | need_send = 1; |
|
|
1162 | |
|
|
1163 | count = -1; |
|
|
1164 | |
|
|
1165 | /* properly clear a previously sent big face */ |
|
|
1166 | if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] |
|
|
1167 | || lastcell.stat_hp || lastcell.flags || lastcell.player) |
|
|
1168 | need_send = 1; |
|
|
1169 | |
|
|
1170 | map_clearcell (&lastcell, count); |
|
|
1171 | |
|
|
1172 | if ((mask & 0xf) || need_send) |
|
|
1173 | sl[oldlen + 1] = mask & 0xff; |
|
|
1174 | else |
|
|
1175 | sl.reset (oldlen); |
|
|
1176 | } |
|
|
1177 | else |
|
|
1178 | { |
|
|
1179 | /* In this block, the space is visible. |
|
|
1180 | */ |
|
|
1181 | |
|
|
1182 | /* Rather than try to figure out what everything that we might |
|
|
1183 | * need to send is, then form the packet after that, |
|
|
1184 | * we presume that we will in fact form a packet, and update |
|
|
1185 | * the bits by what we do actually send. If we send nothing, |
|
|
1186 | * we just back out sl.length () to the old value, and no harm |
|
|
1187 | * is done. |
|
|
1188 | * I think this is simpler than doing a bunch of checks to see |
|
|
1189 | * what if anything we need to send, setting the bits, then |
|
|
1190 | * doing those checks again to add the real data. |
|
|
1191 | */ |
|
|
1192 | oldlen = sl.length (); |
|
|
1193 | eoldlen = esl.length (); |
|
|
1194 | |
|
|
1195 | sl << uint16 (mask); |
|
|
1196 | |
|
|
1197 | unsigned char dummy; |
|
|
1198 | unsigned char *last_ext = &dummy; |
|
|
1199 | |
|
|
1200 | /* Darkness changed */ |
|
|
1201 | if (lastcell.count != d && socket.darkness) |
|
|
1202 | { |
1139 | { |
|
|
1140 | lastcell.stat_hp = stat_hp; |
|
|
1141 | |
1203 | mask |= 0x8; |
1142 | mask |= 0x8; |
|
|
1143 | *last_ext |= 0x80; |
|
|
1144 | last_ext = &sl[sl.length ()]; |
1204 | |
1145 | |
1205 | if (socket.extmap) |
1146 | sl << uint8 (5) << uint8 (stat_hp); |
|
|
1147 | |
|
|
1148 | if (stat_width > 1) |
1206 | { |
1149 | { |
1207 | *last_ext |= 0x80; |
1150 | *last_ext |= 0x80; |
1208 | last_ext = &sl[sl.length ()]; |
1151 | last_ext = &sl[sl.length ()]; |
1209 | sl << uint8 (d); |
|
|
1210 | } |
|
|
1211 | else |
|
|
1212 | sl << uint8 (255 - 64 * d); |
|
|
1213 | } |
|
|
1214 | |
1152 | |
1215 | lastcell.count = d; |
|
|
1216 | |
|
|
1217 | mapspace &ms = m->at (nx, ny); |
|
|
1218 | |
|
|
1219 | if (socket.extmap) |
|
|
1220 | { |
|
|
1221 | uint8 stat_hp = 0; |
|
|
1222 | uint8 stat_width = 0; |
|
|
1223 | uint8 flags = 0; |
|
|
1224 | tag_t player = 0; |
|
|
1225 | |
|
|
1226 | // send hp information, if applicable |
|
|
1227 | if (object *op = ms.faces_obj [0]) |
|
|
1228 | { |
|
|
1229 | if (op->head || op->invisible) |
|
|
1230 | ; // do not show |
|
|
1231 | else if (op->type == PLAYER |
|
|
1232 | || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) |
|
|
1233 | { |
|
|
1234 | if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) |
|
|
1235 | { |
|
|
1236 | stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; |
|
|
1237 | stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge |
|
|
1238 | } |
|
|
1239 | } |
|
|
1240 | |
|
|
1241 | if (op->msg && op->msg[0] == '@') |
|
|
1242 | flags |= 1; |
|
|
1243 | |
|
|
1244 | if (op->type == PLAYER && op != ob) |
|
|
1245 | player = op->count; |
|
|
1246 | } |
|
|
1247 | |
|
|
1248 | if (lastcell.stat_hp != stat_hp) |
|
|
1249 | { |
|
|
1250 | lastcell.stat_hp = stat_hp; |
|
|
1251 | |
|
|
1252 | mask |= 0x8; |
|
|
1253 | *last_ext |= 0x80; |
|
|
1254 | last_ext = &sl[sl.length ()]; |
|
|
1255 | |
|
|
1256 | sl << uint8 (5) << uint8 (stat_hp); |
|
|
1257 | |
|
|
1258 | if (stat_width > 1) |
|
|
1259 | { |
|
|
1260 | *last_ext |= 0x80; |
|
|
1261 | last_ext = &sl[sl.length ()]; |
|
|
1262 | |
|
|
1263 | sl << uint8 (6) << uint8 (stat_width); |
1153 | sl << uint8 (6) << uint8 (stat_width); |
1264 | } |
|
|
1265 | } |
1154 | } |
1266 | |
|
|
1267 | if (lastcell.player != player) |
|
|
1268 | { |
|
|
1269 | lastcell.player = player; |
|
|
1270 | |
|
|
1271 | mask |= 0x8; |
|
|
1272 | *last_ext |= 0x80; |
|
|
1273 | last_ext = &sl[sl.length ()]; |
|
|
1274 | |
|
|
1275 | sl << uint8 (0x47) << uint8 (4) << (uint32)player; |
|
|
1276 | } |
|
|
1277 | |
|
|
1278 | if (lastcell.flags != flags) |
|
|
1279 | { |
|
|
1280 | lastcell.flags = flags; |
|
|
1281 | |
|
|
1282 | mask |= 0x8; |
|
|
1283 | *last_ext |= 0x80; |
|
|
1284 | last_ext = &sl[sl.length ()]; |
|
|
1285 | |
|
|
1286 | sl << uint8 (8) << uint8 (flags); |
|
|
1287 | } |
|
|
1288 | } |
1155 | } |
1289 | |
1156 | |
1290 | /* Floor face */ |
1157 | if (expect_false (lastcell.player != player)) |
1291 | if (update_space (sl, socket, ms, lastcell, 2)) |
1158 | { |
|
|
1159 | lastcell.player = player; |
|
|
1160 | |
1292 | mask |= 0x4; |
1161 | mask |= 0x8; |
|
|
1162 | *last_ext |= 0x80; |
|
|
1163 | last_ext = &sl[sl.length ()]; |
1293 | |
1164 | |
1294 | /* Middle face */ |
1165 | sl << uint8 (0x47) << uint8 (4) << (uint32)player; |
1295 | if (update_space (sl, socket, ms, lastcell, 1)) |
1166 | } |
|
|
1167 | |
|
|
1168 | if (expect_false (lastcell.flags != flags)) |
|
|
1169 | { |
|
|
1170 | lastcell.flags = flags; |
|
|
1171 | |
1296 | mask |= 0x2; |
1172 | mask |= 0x8; |
|
|
1173 | *last_ext |= 0x80; |
|
|
1174 | last_ext = &sl[sl.length ()]; |
1297 | |
1175 | |
1298 | if (ms.player () == ob |
1176 | sl << uint8 (8) << uint8 (flags); |
1299 | && (ob->invisible & (ob->invisible < 50 ? 1 : 7))) |
|
|
1300 | { |
1177 | } |
|
|
1178 | } |
|
|
1179 | |
|
|
1180 | /* Floor face */ |
|
|
1181 | if (update_space (sl, socket, ms, lastcell, 2)) |
|
|
1182 | mask |= 0x4; |
|
|
1183 | |
|
|
1184 | /* Middle face */ |
|
|
1185 | if (update_space (sl, socket, ms, lastcell, 1)) |
|
|
1186 | mask |= 0x2; |
|
|
1187 | |
|
|
1188 | if (expect_false (ob->invisible) |
|
|
1189 | && ob->invisible & (ob->invisible < 50 ? 1 : 7) |
|
|
1190 | && ms.player () == ob) |
|
|
1191 | { |
1301 | // force player to be visible to himself if invisible |
1192 | // force player to be visible to himself if invisible |
1302 | if (lastcell.faces[0] != ob->face) |
1193 | if (lastcell.faces[0] != ob->face) |
1303 | { |
1194 | { |
1304 | lastcell.faces[0] = ob->face; |
1195 | lastcell.faces[0] = ob->face; |
1305 | |
1196 | |
1306 | mask |= 0x1; |
|
|
1307 | sl << uint16 (ob->face); |
|
|
1308 | |
|
|
1309 | socket.send_faces (ob); |
|
|
1310 | } |
|
|
1311 | } |
|
|
1312 | /* Top face */ |
|
|
1313 | else if (update_space (sl, socket, ms, lastcell, 0)) |
|
|
1314 | mask |= 0x1; |
1197 | mask |= 0x1; |
|
|
1198 | sl << uint16 (ob->face); |
1315 | |
1199 | |
|
|
1200 | socket.send_faces (ob); |
|
|
1201 | } |
|
|
1202 | } |
|
|
1203 | /* Top face */ |
|
|
1204 | else if (update_space (sl, socket, ms, lastcell, 0)) |
|
|
1205 | mask |= 0x1; |
|
|
1206 | |
1316 | /* Check to see if we are in fact sending anything for this |
1207 | /* Check to see if we are in fact sending anything for this |
1317 | * space by checking the mask. If so, update the mask. |
1208 | * space by checking the mask. If so, update the mask. |
1318 | * if not, reset the len to that from before adding the mask |
1209 | * if not, reset the len to that from before adding the mask |
1319 | * value, so we don't send those bits. |
1210 | * value, so we don't send those bits. |
1320 | */ |
1211 | */ |
1321 | if (mask & 0xf) |
1212 | if (mask & 0xf) |
1322 | sl[oldlen + 1] = mask & 0xff; |
1213 | sl[oldlen + 1] = mask & 0xff; |
1323 | else |
1214 | else |
1324 | sl.reset (oldlen); |
1215 | sl.reset (oldlen); |
1325 | |
|
|
1326 | if (socket.ext_mapinfos) |
|
|
1327 | esl << uint16 (emask); |
|
|
1328 | |
|
|
1329 | if (socket.EMI_smooth) |
|
|
1330 | { |
|
|
1331 | for (int layer = 2+1; layer--; ) |
|
|
1332 | { |
|
|
1333 | object *ob = ms.faces_obj [layer]; |
|
|
1334 | |
|
|
1335 | // If there is no object for this space, or if the face for the object |
|
|
1336 | // is the blank face, set the smoothlevel to zero. |
|
|
1337 | int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0; |
|
|
1338 | |
|
|
1339 | // We've gotten what face we want to use for the object. Now see if |
|
|
1340 | // if it has changed since we last sent it to the client. |
|
|
1341 | if (lastcell.smooth[layer] != smoothlevel) |
|
|
1342 | { |
|
|
1343 | lastcell.smooth[layer] = smoothlevel; |
|
|
1344 | esl << uint8 (smoothlevel); |
|
|
1345 | emask |= 1 << layer; |
|
|
1346 | } |
|
|
1347 | } |
|
|
1348 | |
|
|
1349 | if (emask & 0xf) |
|
|
1350 | esl[eoldlen + 1] = emask & 0xff; |
|
|
1351 | else |
|
|
1352 | esl.reset (eoldlen); |
|
|
1353 | } |
|
|
1354 | } /* else this is a viewable space */ |
1216 | } /* else this is a viewable space */ |
1355 | } /* for x loop */ |
1217 | ordered_mapwalk_end |
1356 | } /* for y loop */ |
|
|
1357 | |
1218 | |
1358 | socket.flush_fx (); |
1219 | socket.flush_fx (); |
1359 | |
|
|
1360 | /* Verify that we in fact do need to send this */ |
|
|
1361 | if (socket.ext_mapinfos) |
|
|
1362 | { |
|
|
1363 | if (!(sl.length () > startlen || socket.sent_scroll)) |
|
|
1364 | { |
|
|
1365 | /* No map data will follow, so don't say the client |
|
|
1366 | * it doesn't need draw! |
|
|
1367 | */ |
|
|
1368 | ewhatflag &= ~EMI_NOREDRAW; |
|
|
1369 | esl[ewhatstart + 1] = ewhatflag & 0xff; |
|
|
1370 | } |
|
|
1371 | |
|
|
1372 | if (esl.length () > estartlen) |
|
|
1373 | socket.send_packet (esl); |
|
|
1374 | } |
|
|
1375 | |
1220 | |
1376 | if (sl.length () > startlen || socket.sent_scroll) |
1221 | if (sl.length () > startlen || socket.sent_scroll) |
1377 | { |
1222 | { |
1378 | socket.send_packet (sl); |
1223 | socket.send_packet (sl); |
1379 | socket.sent_scroll = 0; |
1224 | socket.sent_scroll = 0; |
… | |
… | |
1400 | { |
1245 | { |
1401 | packet sl; |
1246 | packet sl; |
1402 | sl << "replyinfo skill_info\n"; |
1247 | sl << "replyinfo skill_info\n"; |
1403 | |
1248 | |
1404 | for (int i = 1; i < NUM_SKILLS; i++) |
1249 | for (int i = 1; i < NUM_SKILLS; i++) |
1405 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
1250 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]); |
1406 | |
1251 | |
1407 | if (sl.length () >= MAXSOCKBUF) |
1252 | if (sl.length () > MAXSOCKBUF) |
1408 | { |
1253 | { |
1409 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
1254 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
1410 | fatal (0); |
1255 | fatal (0); |
1411 | } |
1256 | } |
1412 | |
1257 | |
… | |
… | |
1425 | sl << "replyinfo spell_paths\n"; |
1270 | sl << "replyinfo spell_paths\n"; |
1426 | |
1271 | |
1427 | for (int i = 0; i < NRSPELLPATHS; i++) |
1272 | for (int i = 0; i < NRSPELLPATHS; i++) |
1428 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
1273 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
1429 | |
1274 | |
1430 | if (sl.length () >= MAXSOCKBUF) |
1275 | if (sl.length () > MAXSOCKBUF) |
1431 | { |
1276 | { |
1432 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
1277 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
1433 | fatal (0); |
1278 | fatal (0); |
1434 | } |
1279 | } |
1435 | |
1280 | |
… | |
… | |
1454 | if (spell->type == SPELL) |
1299 | if (spell->type == SPELL) |
1455 | { |
1300 | { |
1456 | int flags = 0; |
1301 | int flags = 0; |
1457 | |
1302 | |
1458 | /* check if we need to update it */ |
1303 | /* check if we need to update it */ |
1459 | if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) |
1304 | if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) |
1460 | { |
1305 | { |
1461 | spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
1306 | spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
1462 | flags |= UPD_SP_MANA; |
1307 | flags |= UPD_SP_MANA; |
1463 | } |
1308 | } |
1464 | |
1309 | |
1465 | if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) |
1310 | if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) |
1466 | { |
1311 | { |
1467 | spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
1312 | spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
1468 | flags |= UPD_SP_GRACE; |
1313 | flags |= UPD_SP_GRACE; |
1469 | } |
1314 | } |
1470 | |
1315 | |
1471 | if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) |
1316 | if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) |
1472 | { |
1317 | { |
1473 | spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
1318 | spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
1474 | flags |= UPD_SP_DAMAGE; |
1319 | flags |= UPD_SP_DAMAGE; |
1475 | } |
1320 | } |
1476 | |
1321 | |
1477 | if (flags) |
1322 | if (flags) |
1478 | { |
1323 | { |
… | |
… | |
1480 | |
1325 | |
1481 | sl << "updspell " |
1326 | sl << "updspell " |
1482 | << uint8 (flags) |
1327 | << uint8 (flags) |
1483 | << uint32 (spell->count); |
1328 | << uint32 (spell->count); |
1484 | |
1329 | |
1485 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
1330 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); |
1486 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
1331 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); |
1487 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
1332 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); |
1488 | |
1333 | |
1489 | pl->ns->send_packet (sl); |
1334 | pl->ns->send_packet (sl); |
1490 | } |
1335 | } |
1491 | } |
1336 | } |
1492 | } |
1337 | } |
… | |
… | |
1522 | LOG (llevError, "item number %d is a spell with no name.\n", spell->count); |
1367 | LOG (llevError, "item number %d is a spell with no name.\n", spell->count); |
1523 | return; |
1368 | return; |
1524 | } |
1369 | } |
1525 | |
1370 | |
1526 | /* store costs and damage in the object struct, to compare to later */ |
1371 | /* store costs and damage in the object struct, to compare to later */ |
1527 | spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
1372 | spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
1528 | spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
1373 | spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
1529 | spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
1374 | spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
1530 | |
1375 | |
1531 | /* figure out which skill it uses, if it uses one */ |
1376 | /* figure out which skill it uses, if it uses one */ |
1532 | if (spell->skill) |
1377 | if (spell->skill) |
1533 | { |
1378 | if (object *tmp = pl->find_skill (spell->skill)) |
1534 | for (i = 1; i < NUM_SKILLS; i++) |
|
|
1535 | if (!strcmp (spell->skill, skill_names[i])) |
|
|
1536 | { |
|
|
1537 | skill = i + CS_STAT_SKILLINFO; |
1379 | skill = tmp->subtype + CS_STAT_SKILLINFO; |
1538 | break; |
|
|
1539 | } |
|
|
1540 | } |
|
|
1541 | |
1380 | |
1542 | // spells better have a face |
1381 | // spells better have a face |
1543 | if (!spell->face) |
1382 | if (!spell->face) |
1544 | { |
1383 | { |
1545 | LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); |
1384 | LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); |
1546 | spell->face = face_find ("burnout.x11", blank_face); |
1385 | spell->face = face_find ("burnout.x11", blank_face); |
1547 | } |
1386 | } |
|
|
1387 | |
|
|
1388 | pl->ns->send_face (spell->face); |
1548 | |
1389 | |
1549 | /* send the current values */ |
1390 | /* send the current values */ |
1550 | sl << uint32 (spell->count) |
1391 | sl << uint32 (spell->count) |
1551 | << uint16 (spell->level) |
1392 | << uint16 (spell->level) |
1552 | << uint16 (spell->casting_time) |
1393 | << uint16 (spell->casting_time) |
1553 | << uint16 (spell->last_sp) |
1394 | << uint16 (spell->cached_sp) |
1554 | << uint16 (spell->last_grace) |
1395 | << uint16 (spell->cached_grace) |
1555 | << uint16 (spell->last_eat) |
1396 | << uint16 (spell->cached_eat) |
1556 | << uint8 (skill) |
1397 | << uint8 (skill) |
1557 | << uint32 (spell->path_attuned) |
1398 | << uint32 (spell->path_attuned) |
1558 | << uint32 (spell->face) |
1399 | << uint32 (spell->face) |
1559 | << data8 (spell->name) |
1400 | << data8 (spell->name) |
1560 | << data16 (spell->msg); |
1401 | << data16 (spell->msg); |
… | |
… | |
1588 | * bytes and 3 strings (because that is the spec) so we need to |
1429 | * bytes and 3 strings (because that is the spec) so we need to |
1589 | * check that the length of those 3 strings, plus the 23 bytes, |
1430 | * check that the length of those 3 strings, plus the 23 bytes, |
1590 | * won't take us over the length limit for the socket, if it does, |
1431 | * won't take us over the length limit for the socket, if it does, |
1591 | * we need to send what we already have, and restart packet formation |
1432 | * we need to send what we already have, and restart packet formation |
1592 | */ |
1433 | */ |
|
|
1434 | if (spell->type != SPELL) |
|
|
1435 | continue; |
|
|
1436 | |
1593 | /* Seeing crashes by overflowed buffers. Quick arithemetic seems |
1437 | /* Seeing crashes by overflowed buffers. Quick arithemetic seems |
1594 | * to show add_spell is 26 bytes + 2 strings. However, the overun |
1438 | * to show add_spell is 26 bytes + 2 strings. However, the overun |
1595 | * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem |
1439 | * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem |
1596 | * like it will fix this |
1440 | * like it will fix this |
1597 | */ |
1441 | */ |
1598 | if (spell->type != SPELL) |
|
|
1599 | continue; |
|
|
1600 | |
|
|
1601 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
1442 | if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
1602 | { |
1443 | { |
|
|
1444 | pl->ns->flush_fx (); |
1603 | pl->ns->send_packet (sl); |
1445 | pl->ns->send_packet (sl); |
1604 | |
1446 | |
1605 | sl.reset (); |
1447 | sl.reset (); |
1606 | sl << "addspell "; |
1448 | sl << "addspell "; |
1607 | } |
1449 | } |
… | |
… | |
1615 | return; |
1457 | return; |
1616 | } |
1458 | } |
1617 | else |
1459 | else |
1618 | append_spell (pl, sl, spell); |
1460 | append_spell (pl, sl, spell); |
1619 | |
1461 | |
1620 | if (sl.length () >= MAXSOCKBUF) |
1462 | if (sl.length () > MAXSOCKBUF) |
1621 | { |
1463 | { |
1622 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
1464 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
1623 | fatal (0); |
1465 | fatal (0); |
1624 | } |
1466 | } |
1625 | |
1467 | |
1626 | /* finally, we can send the packet */ |
1468 | /* finally, we can send the packet */ |
|
|
1469 | pl->ns->flush_fx (); |
1627 | pl->ns->send_packet (sl); |
1470 | pl->ns->send_packet (sl); |
1628 | } |
1471 | } |
1629 | |
1472 | |