1 | |
|
|
2 | /* |
1 | /* |
3 | * static char *rcsid_init_c = |
|
|
4 | * "$Id: request.C,v 1.18 2006/09/14 19:08:41 root Exp $"; |
|
|
5 | */ |
|
|
6 | |
|
|
7 | /* |
|
|
8 | CrossFire, A Multiplayer game for X-windows |
2 | * CrossFire, A Multiplayer game for X-windows |
9 | |
3 | * |
|
|
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
10 | Copyright (C) 2001 Mark Wedel |
5 | * Copyright (C) 2001 Mark Wedel |
11 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (C) 1992 Frank Tore Johansen |
12 | |
7 | * |
13 | This program is free software; you can redistribute it and/or modify |
8 | * This program is free software; you can redistribute it and/or modify |
14 | it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
15 | the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
16 | (at your option) any later version. |
11 | * (at your option) any later version. |
17 | |
12 | * |
18 | This program is distributed in the hope that it will be useful, |
13 | * This program is distributed in the hope that it will be useful, |
19 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
20 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
21 | GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
22 | |
17 | * |
23 | You should have received a copy of the GNU General Public License |
18 | * You should have received a copy of the GNU General Public License |
24 | along with this program; if not, write to the Free Software |
19 | * along with this program; if not, write to the Free Software |
25 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
26 | |
21 | * |
27 | The author can be reached via e-mail to crossfire-devel@real-time.com |
22 | * The author can be reached via e-mail to <crossfire@schmorp.de> |
28 | */ |
23 | */ |
29 | |
24 | |
30 | /** |
25 | /** |
31 | * \file |
26 | * \file |
32 | * Client handling. |
27 | * Client handling. |
33 | * |
28 | * |
… | |
… | |
41 | * have the prototype of (char *data, int datalen, int client_num). This |
36 | * have the prototype of (char *data, int datalen, int client_num). This |
42 | * way, we can use one dispatch table. |
37 | * way, we can use one dispatch table. |
43 | * |
38 | * |
44 | * esrv_map_new starts updating the map |
39 | * esrv_map_new starts updating the map |
45 | * |
40 | * |
46 | * esrv_map_setbelow allows filling in all of the faces for the map. |
|
|
47 | * if a face has not already been sent to the client, it is sent now. |
|
|
48 | * |
|
|
49 | * mapcellchanged, compactlayer, compactstack, perform the map compressing |
|
|
50 | * operations |
|
|
51 | * |
|
|
52 | * esrv_map_doneredraw finishes the map update, and ships across the |
|
|
53 | * map updates. |
|
|
54 | * |
|
|
55 | */ |
41 | */ |
56 | |
42 | |
57 | #include <global.h> |
43 | #include <global.h> |
58 | #include <sproto.h> |
44 | #include <sproto.h> |
59 | |
45 | |
60 | #include <newclient.h> |
|
|
61 | #include <newserver.h> |
|
|
62 | #include <living.h> |
46 | #include <living.h> |
63 | #include <commands.h> |
47 | #include <commands.h> |
64 | |
48 | |
65 | /* This block is basically taken from socket.c - I assume if it works there, |
49 | /* This block is basically taken from socket.c - I assume if it works there, |
66 | * it should work here. |
50 | * it should work here. |
67 | */ |
51 | */ |
68 | #ifndef WIN32 /* ---win32 exclude unix headers */ |
|
|
69 | # include <sys/types.h> |
52 | #include <sys/types.h> |
70 | # include <sys/time.h> |
53 | #include <sys/time.h> |
71 | # include <sys/socket.h> |
54 | #include <sys/socket.h> |
72 | # include <netinet/in.h> |
55 | #include <netinet/in.h> |
73 | # include <netdb.h> |
56 | #include <netdb.h> |
74 | #endif /* win32 */ |
|
|
75 | |
57 | |
76 | #ifdef HAVE_UNISTD_H |
|
|
77 | # include <unistd.h> |
58 | #include <unistd.h> |
78 | #endif |
|
|
79 | |
|
|
80 | #ifdef HAVE_SYS_TIME_H |
|
|
81 | # include <sys/time.h> |
59 | #include <sys/time.h> |
82 | #endif |
|
|
83 | |
60 | |
84 | #include "sounds.h" |
61 | #include "sounds.h" |
85 | |
62 | |
86 | /** |
63 | /** |
87 | * This table translates the attack numbers as used within the |
64 | * This table translates the attack numbers as used within the |
… | |
… | |
104 | -1, /* life stealing */ |
81 | -1, /* life stealing */ |
105 | -1 /* Disease - not fully done yet */ |
82 | -1 /* Disease - not fully done yet */ |
106 | }; |
83 | }; |
107 | |
84 | |
108 | static void |
85 | static void |
109 | socket_map_scroll (NewSocket * ns, int dx, int dy) |
86 | socket_map_scroll (client *ns, int dx, int dy) |
110 | { |
87 | { |
111 | struct Map newmap; |
88 | struct Map newmap; |
112 | int x, y, mx, my; |
89 | int x, y, mx, my; |
113 | |
90 | |
114 | { |
|
|
115 | char buf[MAXSOCKBUF]; |
|
|
116 | |
|
|
117 | sprintf (buf, "map_scroll %d %d", dx, dy); |
91 | ns->send_packet_printf ("map_scroll %d %d", dx, dy); |
118 | Write_String_To_Socket (ns, buf, strlen (buf)); |
|
|
119 | } |
|
|
120 | |
92 | |
121 | /* If we are using the Map1aCmd, we may in fact send |
93 | /* If we are using the Map1aCmd, we may in fact send |
122 | * head information that is outside the viewable map. |
94 | * head information that is outside the viewable map. |
123 | * So set the mx,my to the max value we want to |
95 | * So set the mx,my to the max value we want to |
124 | * look for. Removed code to do so - it caused extra |
96 | * look for. Removed code to do so - it caused extra |
… | |
… | |
126 | * that much difference in bandwidth. |
98 | * that much difference in bandwidth. |
127 | */ |
99 | */ |
128 | mx = ns->mapx; |
100 | mx = ns->mapx; |
129 | my = ns->mapy; |
101 | my = ns->mapy; |
130 | |
102 | |
131 | if (ns->mapmode == Map1aCmd) |
|
|
132 | { |
|
|
133 | mx += MAX_HEAD_OFFSET; |
|
|
134 | my += MAX_HEAD_OFFSET; |
|
|
135 | } |
|
|
136 | |
|
|
137 | /* the x and y here are coordinates for the new map, i.e. if we moved |
103 | /* the x and y here are coordinates for the new map, i.e. if we moved |
138 | * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, |
104 | * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, |
139 | * if the destination x or y coordinate is outside the viewable |
105 | * if the destination x or y coordinate is outside the viewable |
140 | * area, we clear the values - otherwise, the old values |
106 | * area, we clear the values - otherwise, the old values |
141 | * are preserved, and the check_head thinks it needs to clear them. |
107 | * are preserved, and the check_head thinks it needs to clear them. |
… | |
… | |
143 | for (x = 0; x < mx; x++) |
109 | for (x = 0; x < mx; x++) |
144 | { |
110 | { |
145 | for (y = 0; y < my; y++) |
111 | for (y = 0; y < my; y++) |
146 | { |
112 | { |
147 | if (x >= ns->mapx || y >= ns->mapy) |
113 | if (x >= ns->mapx || y >= ns->mapy) |
148 | { |
|
|
149 | /* clear cells outside the viewable area */ |
114 | /* clear cells outside the viewable area */ |
150 | memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); |
115 | memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); |
151 | } |
|
|
152 | 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) |
153 | { |
|
|
154 | /* clear newly visible tiles within the viewable area */ |
117 | /* clear newly visible tiles within the viewable area */ |
155 | memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); |
118 | memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); |
156 | } |
|
|
157 | else |
119 | else |
158 | { |
|
|
159 | 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)); |
160 | } |
|
|
161 | } |
121 | } |
162 | } |
122 | } |
163 | |
123 | |
164 | memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); |
124 | memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); |
165 | |
125 | |
… | |
… | |
170 | } |
130 | } |
171 | |
131 | |
172 | static void |
132 | static void |
173 | clear_map (player *pl) |
133 | clear_map (player *pl) |
174 | { |
134 | { |
175 | NewSocket & socket = pl->socket; |
|
|
176 | |
|
|
177 | memset (&socket.lastmap, 0, sizeof (socket.lastmap)); |
135 | memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); |
178 | |
136 | |
|
|
137 | pl->ns->force_newmap = false; |
|
|
138 | |
179 | if (socket.newmapcmd == 1) |
139 | if (pl->ns->newmapcmd == 1) |
180 | Write_String_To_Socket (&socket, "newmap", 6); |
140 | pl->ns->send_packet ("newmap"); |
181 | |
141 | |
182 | socket.update_look = 1; |
142 | pl->ns->floorbox_reset (); |
183 | socket.look_position = 0; |
|
|
184 | } |
143 | } |
185 | |
144 | |
186 | /** check for map change and send new map data */ |
145 | /** check for map/region change and send new map data */ |
187 | static void |
146 | static void |
188 | check_map_change (player *pl) |
147 | check_map_change (player *pl) |
189 | { |
148 | { |
190 | NewSocket & socket = pl->socket; |
149 | client &socket = *pl->ns; |
191 | object *ob = pl->ob; |
150 | object *ob = pl->ob; |
192 | char buf[MAX_BUF]; /* eauugggh */ |
151 | char buf[MAX_BUF]; /* eauugggh */ |
193 | |
152 | |
194 | if (socket.current_map != ob->map) |
153 | if (socket.current_map != ob->map || socket.force_newmap) |
195 | { |
154 | { |
|
|
155 | clear_map (pl); |
196 | socket.current_map = ob->map; |
156 | socket.current_map = ob->map; |
197 | |
|
|
198 | clear_map (pl); |
|
|
199 | |
157 | |
200 | if (socket.mapinfocmd) |
158 | if (socket.mapinfocmd) |
201 | { |
159 | { |
202 | if (ob->map && ob->map->path[0]) |
160 | if (ob->map && ob->map->path[0]) |
203 | { |
161 | { |
204 | int flags = 0; |
162 | int flags = 0; |
205 | |
163 | |
206 | if (ob->map->tile_path[0]) |
164 | if (ob->map->tile_path[0]) flags |= 1; |
207 | flags |= 1; |
|
|
208 | if (ob->map->tile_path[1]) |
165 | if (ob->map->tile_path[1]) flags |= 2; |
209 | flags |= 2; |
|
|
210 | if (ob->map->tile_path[2]) |
166 | if (ob->map->tile_path[2]) flags |= 4; |
211 | flags |= 4; |
|
|
212 | if (ob->map->tile_path[3]) |
167 | if (ob->map->tile_path[3]) flags |= 8; |
213 | flags |= 8; |
|
|
214 | |
168 | |
215 | snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", |
169 | snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", |
216 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); |
170 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path); |
217 | } |
171 | } |
218 | else |
172 | else |
219 | snprintf (buf, MAX_BUF, "mapinfo current"); |
173 | snprintf (buf, MAX_BUF, "mapinfo current"); |
220 | |
174 | |
221 | Write_String_To_Socket (&socket, buf, strlen (buf)); |
175 | socket.send_packet (buf); |
222 | } |
176 | } |
223 | } |
177 | } |
224 | else if (socket.current_x != ob->x || socket.current_y != ob->y) |
178 | else if (socket.current_x != ob->x || socket.current_y != ob->y) |
225 | { |
179 | { |
226 | int dx = ob->x - socket.current_x; |
180 | int dx = ob->x - socket.current_x; |
… | |
… | |
229 | if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) |
183 | if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) |
230 | clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows |
184 | clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows |
231 | else |
185 | else |
232 | { |
186 | { |
233 | socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); |
187 | socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); |
234 | socket.update_look = 1; |
188 | socket.floorbox_reset (); |
235 | socket.look_position = 0; |
|
|
236 | } |
189 | } |
237 | } |
190 | } |
238 | |
191 | |
239 | socket.current_x = ob->x; |
192 | socket.current_x = ob->x; |
240 | socket.current_y = ob->y; |
193 | socket.current_y = ob->y; |
|
|
194 | |
|
|
195 | region *reg = ob->region (); |
|
|
196 | if (socket.current_region != reg) |
|
|
197 | { |
|
|
198 | socket.current_region = reg; |
|
|
199 | socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", ®->longname); |
|
|
200 | } |
|
|
201 | } |
|
|
202 | |
|
|
203 | /** |
|
|
204 | * RequestInfo is sort of a meta command. There is some specific |
|
|
205 | * request of information, but we call other functions to provide |
|
|
206 | * that information. |
|
|
207 | */ |
|
|
208 | void |
|
|
209 | RequestInfo (char *buf, int len, client * ns) |
|
|
210 | { |
|
|
211 | char *params = NULL, *cp; |
|
|
212 | |
|
|
213 | /* No match */ |
|
|
214 | char bigbuf[MAX_BUF]; |
|
|
215 | int slen; |
|
|
216 | |
|
|
217 | /* Set up replyinfo before we modify any of the buffers - this is used |
|
|
218 | * if we don't find a match. |
|
|
219 | */ |
|
|
220 | strcpy (bigbuf, "replyinfo "); |
|
|
221 | slen = strlen (bigbuf); |
|
|
222 | safe_strcat (bigbuf, buf, &slen, MAX_BUF); |
|
|
223 | |
|
|
224 | /* find the first space, make it null, and update the |
|
|
225 | * params pointer. |
|
|
226 | */ |
|
|
227 | for (cp = buf; *cp != '\0'; cp++) |
|
|
228 | if (*cp == ' ') |
|
|
229 | { |
|
|
230 | *cp = '\0'; |
|
|
231 | params = cp + 1; |
|
|
232 | break; |
|
|
233 | } |
|
|
234 | |
|
|
235 | if (!strcmp (buf, "image_info")) |
|
|
236 | send_image_info (ns, params); |
|
|
237 | else if (!strcmp (buf, "image_sums")) |
|
|
238 | send_image_sums (ns, params); |
|
|
239 | else if (!strcmp (buf, "skill_info")) |
|
|
240 | send_skill_info (ns, params); |
|
|
241 | else if (!strcmp (buf, "spell_paths")) |
|
|
242 | send_spell_paths (ns, params); |
|
|
243 | else |
|
|
244 | ns->send_packet (bigbuf, len); |
241 | } |
245 | } |
242 | |
246 | |
243 | void |
247 | void |
244 | ExtCmd (char *buf, int len, player *pl) |
248 | ExtCmd (char *buf, int len, player *pl) |
245 | { |
249 | { |
246 | INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); |
250 | INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); |
|
|
251 | } |
|
|
252 | |
|
|
253 | void |
|
|
254 | ExtiCmd (char *buf, int len, client *ns) |
|
|
255 | { |
|
|
256 | INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); |
247 | } |
257 | } |
248 | |
258 | |
249 | void |
259 | void |
250 | MapInfoCmd (char *buf, int len, player *pl) |
260 | MapInfoCmd (char *buf, int len, player *pl) |
251 | { |
261 | { |
… | |
… | |
264 | if (!strncmp (buf, "spatial ", 8)) |
274 | if (!strncmp (buf, "spatial ", 8)) |
265 | { |
275 | { |
266 | buf += 8; |
276 | buf += 8; |
267 | |
277 | |
268 | // initial map and its origin |
278 | // initial map and its origin |
269 | mapstruct *map = pl->ob->map; |
279 | maptile *map = pl->ob->map; |
270 | sint16 dx, dy; |
280 | sint16 dx, dy; |
271 | int mapx = pl->socket.mapx / 2 - pl->ob->x; |
281 | int mapx = pl->ns->mapx / 2 - pl->ob->x; |
272 | int mapy = pl->socket.mapy / 2 - pl->ob->y; |
282 | int mapy = pl->ns->mapy / 2 - pl->ob->y; |
273 | int max_distance = 8; // limit maximum path length to something generous |
283 | int max_distance = 8; // limit maximum path length to something generous |
274 | |
284 | |
275 | while (*buf && map && max_distance) |
285 | while (*buf && map && max_distance) |
276 | { |
286 | { |
277 | int dir = *buf++; |
287 | int dir = *buf++; |
278 | |
288 | |
279 | switch (dir) |
289 | switch (dir) |
280 | { |
290 | { |
281 | case '1': |
291 | case '1': |
282 | dx = 0; |
292 | dx = 0; |
283 | dy = -1; |
293 | dy = -1; |
284 | map = get_map_from_coord (map, &dx, &dy); |
294 | map = map->xy_find (dx, dy); |
285 | map && (mapy -= map->height); |
295 | map && (mapy -= map->height); |
286 | break; |
296 | break; |
287 | case '2': |
297 | case '2': |
288 | mapx += map->width; |
298 | mapx += map->width; |
289 | dx = map->width; |
299 | dx = map->width; |
290 | dy = 0; |
300 | dy = 0; |
291 | map = get_map_from_coord (map, &dx, &dy); |
301 | map = map->xy_find (dx, dy); |
292 | break; |
302 | break; |
293 | case '3': |
303 | case '3': |
294 | mapy += map->height; |
304 | mapy += map->height; |
295 | dx = 0; |
305 | dx = 0; |
296 | dy = map->height; |
306 | dy = map->height; |
297 | map = get_map_from_coord (map, &dx, &dy); |
307 | map = map->xy_find (dx, dy); |
298 | break; |
308 | break; |
299 | case '4': |
309 | case '4': |
300 | dx = -1; |
310 | dx = -1; |
301 | dy = 0; |
311 | dy = 0; |
302 | map = get_map_from_coord (map, &dx, &dy); |
312 | map = map->xy_find (dx, dy); |
303 | map && (mapx -= map->width); |
313 | map && (mapx -= map->width); |
304 | break; |
314 | break; |
305 | } |
315 | } |
306 | |
316 | |
307 | --max_distance; |
317 | --max_distance; |
308 | } |
318 | } |
309 | |
319 | |
… | |
… | |
311 | snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token); |
321 | snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token); |
312 | else if (map && map->path[0]) |
322 | else if (map && map->path[0]) |
313 | { |
323 | { |
314 | int flags = 0; |
324 | int flags = 0; |
315 | |
325 | |
316 | if (map->tile_path[0]) |
326 | if (map->tile_path[0]) flags |= 1; |
317 | flags |= 1; |
|
|
318 | if (map->tile_path[1]) |
327 | if (map->tile_path[1]) flags |= 2; |
319 | flags |= 2; |
|
|
320 | if (map->tile_path[2]) |
328 | if (map->tile_path[2]) flags |= 4; |
321 | flags |= 4; |
|
|
322 | if (map->tile_path[3]) |
329 | if (map->tile_path[3]) flags |= 8; |
323 | flags |= 8; |
|
|
324 | |
330 | |
325 | snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); |
331 | snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); |
326 | } |
332 | } |
327 | else |
333 | else |
328 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
334 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
329 | } |
335 | } |
330 | else |
336 | else |
331 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
337 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
332 | |
338 | |
333 | Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf)); |
339 | pl->ns->send_packet (bigbuf); |
334 | } |
340 | } |
335 | |
341 | |
336 | /** This is the Setup cmd - easy first implementation */ |
342 | /** This is the Setup cmd */ |
337 | void |
343 | void |
338 | SetUp (char *buf, int len, NewSocket * ns) |
344 | SetUp (char *buf, int len, client * ns) |
339 | { |
345 | { |
340 | int s, slen; |
346 | INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len)); |
341 | char *cmd, *param, cmdback[HUGE_BUF]; |
|
|
342 | |
|
|
343 | /* run through the cmds of setup |
|
|
344 | * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ... |
|
|
345 | * |
|
|
346 | * we send the status of the cmd back, or a FALSE is the cmd is the server unknown |
|
|
347 | * The client then must sort this out |
|
|
348 | */ |
|
|
349 | |
|
|
350 | LOG (llevInfo, "Get SetupCmd:: %s\n", buf); |
|
|
351 | strcpy (cmdback, "setup"); |
|
|
352 | for (s = 0; s < len;) |
|
|
353 | { |
|
|
354 | |
|
|
355 | cmd = &buf[s]; |
|
|
356 | |
|
|
357 | /* find the next space, and put a null there */ |
|
|
358 | for (; buf[s] && buf[s] != ' '; s++); |
|
|
359 | buf[s++] = 0; |
|
|
360 | while (buf[s] == ' ') |
|
|
361 | s++; |
|
|
362 | |
|
|
363 | if (s >= len) |
|
|
364 | break; |
|
|
365 | |
|
|
366 | param = &buf[s]; |
|
|
367 | |
|
|
368 | for (; buf[s] && buf[s] != ' '; s++); |
|
|
369 | buf[s++] = 0; |
|
|
370 | while (buf[s] == ' ') |
|
|
371 | s++; |
|
|
372 | |
|
|
373 | slen = strlen (cmdback); |
|
|
374 | safe_strcat (cmdback, " ", &slen, HUGE_BUF); |
|
|
375 | safe_strcat (cmdback, cmd, &slen, HUGE_BUF); |
|
|
376 | safe_strcat (cmdback, " ", &slen, HUGE_BUF); |
|
|
377 | |
|
|
378 | if (!strcmp (cmd, "sound")) |
|
|
379 | { |
|
|
380 | ns->sound = atoi (param); |
|
|
381 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
382 | } |
|
|
383 | else if (!strcmp (cmd, "exp64")) |
|
|
384 | { |
|
|
385 | ns->exp64 = atoi (param); |
|
|
386 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
387 | } |
|
|
388 | else if (!strcmp (cmd, "spellmon")) |
|
|
389 | { |
|
|
390 | ns->monitor_spells = atoi (param); |
|
|
391 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
392 | } |
|
|
393 | else if (!strcmp (cmd, "darkness")) |
|
|
394 | { |
|
|
395 | ns->darkness = atoi (param); |
|
|
396 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
397 | } |
|
|
398 | else if (!strcmp (cmd, "map1cmd")) |
|
|
399 | { |
|
|
400 | if (atoi (param)) |
|
|
401 | ns->mapmode = Map1Cmd; |
|
|
402 | /* if beyond this size, need to use map1cmd no matter what */ |
|
|
403 | if (ns->mapx > 11 || ns->mapy > 11) |
|
|
404 | ns->mapmode = Map1Cmd; |
|
|
405 | safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF); |
|
|
406 | } |
|
|
407 | else if (!strcmp (cmd, "map1acmd")) |
|
|
408 | { |
|
|
409 | if (atoi (param)) |
|
|
410 | ns->mapmode = Map1aCmd; |
|
|
411 | /* if beyond this size, need to use map1acmd no matter what */ |
|
|
412 | if (ns->mapx > 11 || ns->mapy > 11) |
|
|
413 | ns->mapmode = Map1aCmd; |
|
|
414 | safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF); |
|
|
415 | } |
|
|
416 | else if (!strcmp (cmd, "newmapcmd")) |
|
|
417 | { |
|
|
418 | ns->newmapcmd = atoi (param); |
|
|
419 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
420 | // } else if (!strcmp(cmd,"plugincmd")) { |
|
|
421 | // ns->plugincmd = atoi(param); |
|
|
422 | // safe_strcat(cmdback, param, &slen, HUGE_BUF); |
|
|
423 | } |
|
|
424 | else if (!strcmp (cmd, "mapinfocmd")) |
|
|
425 | { |
|
|
426 | ns->mapinfocmd = atoi (param); |
|
|
427 | safe_strcat (cmdback, "1", &slen, HUGE_BUF); |
|
|
428 | } |
|
|
429 | else if (!strcmp (cmd, "extcmd")) |
|
|
430 | { |
|
|
431 | ns->extcmd = atoi (param); |
|
|
432 | safe_strcat (cmdback, "1", &slen, HUGE_BUF); |
|
|
433 | } |
|
|
434 | else if (!strcmp (cmd, "extmap")) |
|
|
435 | { |
|
|
436 | ns->extmap = atoi (param); |
|
|
437 | safe_strcat (cmdback, "1", &slen, HUGE_BUF); |
|
|
438 | } |
|
|
439 | else if (!strcmp (cmd, "facecache")) |
|
|
440 | { |
|
|
441 | ns->facecache = atoi (param); |
|
|
442 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
443 | } |
|
|
444 | else if (!strcmp (cmd, "faceset")) |
|
|
445 | { |
|
|
446 | char tmpbuf[20]; |
|
|
447 | int q = atoi (param); |
|
|
448 | |
|
|
449 | if (is_valid_faceset (q)) |
|
|
450 | ns->faceset = q; |
|
|
451 | sprintf (tmpbuf, "%d", ns->faceset); |
|
|
452 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
453 | /* if the client is using faceset, it knows about image2 command */ |
|
|
454 | ns->image2 = 1; |
|
|
455 | } |
|
|
456 | else if (!strcmp (cmd, "itemcmd")) |
|
|
457 | { |
|
|
458 | /* Version of the item protocol command to use. Currently, |
|
|
459 | * only supported versions are 1 and 2. Using a numeric |
|
|
460 | * value will make it very easy to extend this in the future. |
|
|
461 | */ |
|
|
462 | char tmpbuf[20]; |
|
|
463 | int q = atoi (param); |
|
|
464 | |
|
|
465 | if (q < 1 || q > 2) |
|
|
466 | { |
|
|
467 | strcpy (tmpbuf, "FALSE"); |
|
|
468 | } |
|
|
469 | else |
|
|
470 | { |
|
|
471 | ns->itemcmd = q; |
|
|
472 | sprintf (tmpbuf, "%d", ns->itemcmd); |
|
|
473 | } |
|
|
474 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
475 | } |
|
|
476 | else if (!strcmp (cmd, "mapsize")) |
|
|
477 | { |
|
|
478 | int x, y = 0; |
|
|
479 | char tmpbuf[MAX_BUF], *cp; |
|
|
480 | |
|
|
481 | x = atoi (param); |
|
|
482 | for (cp = param; *cp != 0; cp++) |
|
|
483 | if (*cp == 'x' || *cp == 'X') |
|
|
484 | { |
|
|
485 | y = atoi (cp + 1); |
|
|
486 | break; |
|
|
487 | } |
|
|
488 | if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) |
|
|
489 | { |
|
|
490 | sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); |
|
|
491 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
492 | } |
|
|
493 | else |
|
|
494 | { |
|
|
495 | ns->mapx = x; |
|
|
496 | ns->mapy = y; |
|
|
497 | /* better to send back what we are really using and not the |
|
|
498 | * param as given to us in case it gets parsed differently. |
|
|
499 | */ |
|
|
500 | sprintf (tmpbuf, "%dx%d", x, y); |
|
|
501 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
502 | /* If beyond this size and still using orig map command, need to |
|
|
503 | * go to map1cmd. |
|
|
504 | */ |
|
|
505 | if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd) |
|
|
506 | ns->mapmode = Map1Cmd; |
|
|
507 | } |
|
|
508 | } |
|
|
509 | else if (!strcmp (cmd, "extendedMapInfos")) |
|
|
510 | { |
|
|
511 | /* Added by tchize |
|
|
512 | * prepare to use the mapextended command |
|
|
513 | */ |
|
|
514 | char tmpbuf[20]; |
|
|
515 | |
|
|
516 | ns->ext_mapinfos = (atoi (param)); |
|
|
517 | sprintf (tmpbuf, "%d", ns->ext_mapinfos); |
|
|
518 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
519 | } |
|
|
520 | else if (!strcmp (cmd, "extendedTextInfos")) |
|
|
521 | { |
|
|
522 | /* Added by tchize |
|
|
523 | * prepare to use the extended text commands |
|
|
524 | * Client toggle this to non zero to get exttext |
|
|
525 | */ |
|
|
526 | char tmpbuf[20]; |
|
|
527 | |
|
|
528 | ns->has_readable_type = (atoi (param)); |
|
|
529 | sprintf (tmpbuf, "%d", ns->has_readable_type); |
|
|
530 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
531 | } |
|
|
532 | else |
|
|
533 | { |
|
|
534 | /* Didn't get a setup command we understood - |
|
|
535 | * report a failure to the client. |
|
|
536 | */ |
|
|
537 | safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); |
|
|
538 | } |
|
|
539 | } /* for processing all the setup commands */ |
|
|
540 | LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); |
|
|
541 | Write_String_To_Socket (ns, cmdback, strlen (cmdback)); |
|
|
542 | } |
347 | } |
543 | |
348 | |
544 | /** |
349 | /** |
545 | * The client has requested to be added to the game. |
350 | * The client has requested to be added to the game. |
546 | * This is what takes care of it. We tell the client how things worked out. |
351 | * This is what takes care of it. We tell the client how things worked out. |
547 | * I am not sure if this file is the best place for this function. however, |
352 | * I am not sure if this file is the best place for this function. however, |
548 | * it either has to be here or init_sockets needs to be exported. |
353 | * it either has to be here or init_sockets needs to be exported. |
549 | */ |
354 | */ |
550 | void |
355 | void |
551 | AddMeCmd (char *buf, int len, NewSocket * ns) |
356 | AddMeCmd (char *buf, int len, client *ns) |
552 | { |
357 | { |
553 | Settings oldsettings; |
358 | INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); |
554 | |
|
|
555 | oldsettings = settings; |
|
|
556 | if (ns->status != Ns_Add || add_player (ns)) |
|
|
557 | { |
|
|
558 | Write_String_To_Socket (ns, "addme_failed", 12); |
|
|
559 | } |
|
|
560 | else |
|
|
561 | { |
|
|
562 | /* Basically, the add_player copies the socket structure into |
|
|
563 | * the player structure, so this one (which is from init_sockets) |
|
|
564 | * is not needed anymore. The write below should still work, as the |
|
|
565 | * stuff in ns is still relevant. |
|
|
566 | */ |
|
|
567 | Write_String_To_Socket (ns, "addme_success", 13); |
|
|
568 | socket_info.nconns--; |
|
|
569 | ns->status = Ns_Avail; |
|
|
570 | } |
|
|
571 | settings = oldsettings; |
|
|
572 | } |
359 | } |
573 | |
360 | |
574 | /** Reply to ExtendedInfos command */ |
361 | /** Reply to ExtendedInfos command */ |
575 | void |
362 | void |
576 | ToggleExtendedInfos (char *buf, int len, NewSocket * ns) |
363 | ToggleExtendedInfos (char *buf, int len, client * ns) |
577 | { |
364 | { |
578 | char cmdback[MAX_BUF]; |
365 | char cmdback[MAX_BUF]; |
579 | char command[50]; |
366 | char command[50]; |
580 | int info, nextinfo; |
367 | int info, nextinfo; |
581 | |
368 | |
… | |
… | |
619 | { |
406 | { |
620 | strcat (cmdback, " "); |
407 | strcat (cmdback, " "); |
621 | strcat (cmdback, "smoothing"); |
408 | strcat (cmdback, "smoothing"); |
622 | } |
409 | } |
623 | |
410 | |
624 | Write_String_To_Socket (ns, cmdback, strlen (cmdback)); |
411 | ns->send_packet (cmdback); |
625 | } |
412 | } |
626 | |
413 | |
627 | /* |
414 | /* |
628 | #define MSG_TYPE_BOOK 1 |
415 | #define MSG_TYPE_BOOK 1 |
629 | #define MSG_TYPE_CARD 2 |
416 | #define MSG_TYPE_CARD 2 |
… | |
… | |
632 | #define MSG_TYPE_MONUMENT 5 |
419 | #define MSG_TYPE_MONUMENT 5 |
633 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
420 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
634 | |
421 | |
635 | /** Reply to ExtendedInfos command */ |
422 | /** Reply to ExtendedInfos command */ |
636 | void |
423 | void |
637 | ToggleExtendedText (char *buf, int len, NewSocket * ns) |
424 | ToggleExtendedText (char *buf, int len, client * ns) |
638 | { |
425 | { |
639 | char cmdback[MAX_BUF]; |
426 | char cmdback[MAX_BUF]; |
640 | char temp[10]; |
427 | char temp[10]; |
641 | char command[50]; |
428 | char command[50]; |
642 | int info, nextinfo, i, flag; |
429 | int info, nextinfo, i, flag; |
… | |
… | |
682 | strcat (cmdback, " "); |
469 | strcat (cmdback, " "); |
683 | snprintf (temp, sizeof (temp), "%d", i); |
470 | snprintf (temp, sizeof (temp), "%d", i); |
684 | strcat (cmdback, temp); |
471 | strcat (cmdback, temp); |
685 | } |
472 | } |
686 | |
473 | |
687 | Write_String_To_Socket (ns, cmdback, strlen (cmdback)); |
474 | ns->send_packet (cmdback); |
688 | } |
475 | } |
689 | |
476 | |
690 | /** |
|
|
691 | * A lot like the old AskSmooth (in fact, now called by AskSmooth). |
|
|
692 | * Basically, it makes no sense to wait for the client to request a |
|
|
693 | * a piece of data from us that we know the client wants. So |
|
|
694 | * if we know the client wants it, might as well push it to the |
|
|
695 | * client. |
|
|
696 | */ |
|
|
697 | static void |
|
|
698 | SendSmooth (NewSocket * ns, uint16 face) |
|
|
699 | { |
|
|
700 | uint16 smoothface; |
|
|
701 | unsigned char reply[MAX_BUF]; |
|
|
702 | SockList sl; |
|
|
703 | |
|
|
704 | /* If we can't find a face, return and set it so we won't try to send this |
|
|
705 | * again. |
|
|
706 | */ |
|
|
707 | if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) |
|
|
708 | { |
|
|
709 | |
|
|
710 | LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); |
|
|
711 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
|
|
712 | return; |
|
|
713 | } |
|
|
714 | |
|
|
715 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
|
|
716 | esrv_send_face (ns, smoothface, 0); |
|
|
717 | |
|
|
718 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
|
|
719 | |
|
|
720 | sl.buf = reply; |
|
|
721 | strcpy ((char *) sl.buf, "smooth "); |
|
|
722 | sl.len = strlen ((char *) sl.buf); |
|
|
723 | SockList_AddShort (&sl, face); |
|
|
724 | SockList_AddShort (&sl, smoothface); |
|
|
725 | Send_With_Handling (ns, &sl); |
|
|
726 | } |
|
|
727 | |
|
|
728 | /** |
477 | /** |
|
|
478 | * client requested an image. send it rate-limited |
|
|
479 | * before flushing. |
|
|
480 | */ |
|
|
481 | void |
|
|
482 | AskFaceCmd (char *buf, int len, client *ns) |
|
|
483 | { |
|
|
484 | ns->askface.push_back (atoi (buf)); |
|
|
485 | } |
|
|
486 | |
|
|
487 | /** |
729 | * Tells client the picture it has to use |
488 | * Tells client the picture it has to use |
730 | * to smooth a picture number given as argument. |
489 | * to smooth a picture number given as argument. |
731 | */ |
490 | */ |
732 | void |
491 | void |
733 | AskSmooth (char *buf, int len, NewSocket * ns) |
492 | AskSmooth (char *buf, int len, client *ns) |
734 | { |
493 | { |
735 | uint16 facenbr; |
494 | ns->send_face (atoi (buf)); |
736 | |
495 | ns->flush_fx (); |
737 | facenbr = atoi (buf); |
|
|
738 | SendSmooth (ns, facenbr); |
|
|
739 | } |
496 | } |
740 | |
|
|
741 | |
|
|
742 | |
|
|
743 | |
|
|
744 | |
497 | |
745 | /** |
498 | /** |
746 | * This handles the general commands from the client (ie, north, fire, cast, |
499 | * This handles the general commands from the client (ie, north, fire, cast, |
747 | * etc.) |
500 | * etc.) |
748 | */ |
501 | */ |
749 | void |
502 | void |
750 | PlayerCmd (char *buf, int len, player *pl) |
503 | PlayerCmd (char *buf, int len, player *pl) |
751 | { |
504 | { |
752 | |
|
|
753 | /* The following should never happen with a proper or honest client. |
|
|
754 | * Therefore, the error message doesn't have to be too clear - if |
|
|
755 | * someone is playing with a hacked/non working client, this gives them |
|
|
756 | * an idea of the problem, but they deserve what they get |
|
|
757 | */ |
|
|
758 | if (pl->state != ST_PLAYING) |
|
|
759 | { |
|
|
760 | new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf); |
|
|
761 | return; |
|
|
762 | } |
|
|
763 | /* Check if there is a count. In theory, a zero count could also be |
505 | /* Check if there is a count. In theory, a zero count could also be |
764 | * sent, so check for that also. |
506 | * sent, so check for that also. |
765 | */ |
507 | */ |
766 | if (atoi (buf) || buf[0] == '0') |
508 | if (atoi (buf) || buf[0] == '0') |
767 | { |
509 | { |
768 | pl->count = atoi ((char *) buf); |
510 | pl->count = atoi ((char *) buf); |
|
|
511 | |
769 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
512 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
770 | if (!buf) |
513 | if (!buf) |
771 | { |
|
|
772 | #ifdef ESRV_DEBUG |
|
|
773 | LOG (llevDebug, "PlayerCmd: Got count but no command.\n"); |
|
|
774 | #endif |
|
|
775 | return; |
514 | return; |
776 | } |
515 | |
777 | buf++; |
516 | buf++; |
778 | } |
517 | } |
779 | /* This should not happen anymore. */ |
518 | |
780 | if (pl->ob->speed_left < -1.0) |
|
|
781 | { |
|
|
782 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
|
|
783 | } |
|
|
784 | /* In c_new.c */ |
|
|
785 | execute_newserver_command (pl->ob, (char *) buf); |
519 | execute_newserver_command (pl->ob, (char *) buf); |
786 | /* Perhaps something better should be done with a left over count. |
|
|
787 | * Cleaning up the input should probably be done first - all actions |
|
|
788 | * for the command that issued the count should be done before any other |
|
|
789 | * commands. |
|
|
790 | */ |
|
|
791 | |
520 | |
792 | pl->count = 0; |
|
|
793 | |
|
|
794 | } |
|
|
795 | |
|
|
796 | |
|
|
797 | /** |
|
|
798 | * This handles the general commands from the client (ie, north, fire, cast, |
|
|
799 | * etc.). It is a lot like PlayerCmd above, but is called with the |
|
|
800 | * 'ncom' method which gives more information back to the client so it |
|
|
801 | * can throttle. |
|
|
802 | */ |
|
|
803 | void |
|
|
804 | NewPlayerCmd (uint8 * buf, int len, player *pl) |
|
|
805 | { |
|
|
806 | int time, repeat; |
|
|
807 | short packet; |
|
|
808 | unsigned char command[MAX_BUF]; |
|
|
809 | SockList sl; |
|
|
810 | |
|
|
811 | if (len < 7) |
|
|
812 | { |
|
|
813 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
|
|
814 | return; |
|
|
815 | } |
|
|
816 | |
|
|
817 | packet = GetShort_String (buf); |
|
|
818 | repeat = GetInt_String (buf + 2); |
|
|
819 | /* -1 is special - no repeat, but don't update */ |
|
|
820 | if (repeat != -1) |
|
|
821 | { |
|
|
822 | pl->count = repeat; |
|
|
823 | } |
|
|
824 | if ((len - 4) >= MAX_BUF) |
|
|
825 | len = MAX_BUF - 5; |
|
|
826 | |
|
|
827 | strncpy ((char *) command, (char *) buf + 6, len - 4); |
|
|
828 | command[len - 4] = '\0'; |
|
|
829 | |
|
|
830 | /* The following should never happen with a proper or honest client. |
|
|
831 | * Therefore, the error message doesn't have to be too clear - if |
|
|
832 | * someone is playing with a hacked/non working client, this gives them |
|
|
833 | * an idea of the problem, but they deserve what they get |
|
|
834 | */ |
|
|
835 | if (pl->state != ST_PLAYING) |
|
|
836 | { |
|
|
837 | new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf); |
|
|
838 | return; |
|
|
839 | } |
|
|
840 | |
|
|
841 | /* This should not happen anymore. */ |
|
|
842 | if (pl->ob->speed_left < -1.0) |
|
|
843 | { |
|
|
844 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
|
|
845 | } |
|
|
846 | /* In c_new.c */ |
|
|
847 | execute_newserver_command (pl->ob, (char *) command); |
|
|
848 | /* Perhaps something better should be done with a left over count. |
521 | /* Perhaps something better should be done with a left over count. |
849 | * Cleaning up the input should probably be done first - all actions |
522 | * Cleaning up the input should probably be done first - all actions |
850 | * for the command that issued the count should be done before any other |
523 | * for the command that issued the count should be done before any other |
851 | * commands. |
524 | * commands. |
852 | */ |
525 | */ |
853 | pl->count = 0; |
526 | pl->count = 0; |
|
|
527 | } |
|
|
528 | |
|
|
529 | |
|
|
530 | /** |
|
|
531 | * This handles the general commands from the client (ie, north, fire, cast, |
|
|
532 | * etc.). It is a lot like PlayerCmd above, but is called with the |
|
|
533 | * 'ncom' method which gives more information back to the client so it |
|
|
534 | * can throttle. |
|
|
535 | */ |
|
|
536 | void |
|
|
537 | NewPlayerCmd (char *buf, int len, player *pl) |
|
|
538 | { |
|
|
539 | if (len <= 6) |
|
|
540 | { |
|
|
541 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
|
|
542 | return; |
|
|
543 | } |
|
|
544 | |
|
|
545 | uint16 cmdid = net_uint16 ((uint8 *)buf); |
|
|
546 | sint32 repeat = net_sint32 ((uint8 *)buf + 2); |
|
|
547 | |
|
|
548 | /* -1 is special - no repeat, but don't update */ |
|
|
549 | if (repeat != -1) |
|
|
550 | pl->count = repeat; |
|
|
551 | |
|
|
552 | buf += 6; //len -= 6; |
|
|
553 | |
|
|
554 | execute_newserver_command (pl->ob, buf); |
|
|
555 | |
|
|
556 | /* Perhaps something better should be done with a left over count. |
|
|
557 | * Cleaning up the input should probably be done first - all actions |
|
|
558 | * for the command that issued the count should be done before any other |
|
|
559 | * commands. |
|
|
560 | */ |
|
|
561 | pl->count = 0; |
|
|
562 | |
|
|
563 | //TODO: schmorp thinks whatever this calculates, it makes no sense at all |
|
|
564 | int time = fabs (pl->ob->speed) < 0.001 |
|
|
565 | ? time = MAX_TIME * 100 |
|
|
566 | : time = (int) (MAX_TIME / fabs (pl->ob->speed)); |
854 | |
567 | |
855 | /* Send confirmation of command execution now */ |
568 | /* Send confirmation of command execution now */ |
856 | sl.buf = command; |
569 | packet sl ("comc"); |
857 | strcpy ((char *) sl.buf, "comc "); |
570 | sl << uint16 (cmdid) << uint32 (time); |
858 | sl.len = 5; |
571 | pl->ns->send_packet (sl); |
859 | SockList_AddShort (&sl, packet); |
|
|
860 | if (FABS (pl->ob->speed) < 0.001) |
|
|
861 | time = MAX_TIME * 100; |
|
|
862 | else |
|
|
863 | time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
|
|
864 | SockList_AddInt (&sl, time); |
|
|
865 | Send_With_Handling (&pl->socket, &sl); |
|
|
866 | } |
572 | } |
867 | |
|
|
868 | |
573 | |
869 | /** This is a reply to a previous query. */ |
574 | /** This is a reply to a previous query. */ |
870 | void |
575 | void |
871 | ReplyCmd (char *buf, int len, player *pl) |
576 | ReplyCmd (char *buf, int len, client *ns) |
872 | { |
577 | { |
|
|
578 | if (ns->state == ST_CUSTOM) |
|
|
579 | { |
|
|
580 | INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len)); |
|
|
581 | return; |
|
|
582 | } |
|
|
583 | |
|
|
584 | if (!ns->pl) |
|
|
585 | return; //TODO: depends on the exact reply we are after |
|
|
586 | //TODO: but right now, we always have a ns->pl |
|
|
587 | |
|
|
588 | player *pl = ns->pl; |
|
|
589 | |
873 | /* This is to synthesize how the data would be stored if it |
590 | /* This is to synthesize how the data would be stored if it |
874 | * was normally entered. A bit of a hack, and should be cleaned up |
591 | * was normally entered. A bit of a hack, and should be cleaned up |
875 | * once all the X11 code is removed from the server. |
592 | * once all the X11 code is removed from the server. |
876 | * |
593 | * |
877 | * We pass 13 to many of the functions because this way they |
594 | * We pass 13 to many of the functions because this way they |
878 | * think it was the carriage return that was entered, and the |
595 | * think it was the carriage return that was entered, and the |
879 | * function then does not try to do additional input. |
596 | * function then does not try to do additional input. |
880 | */ |
597 | */ |
881 | snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); |
598 | snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); |
882 | |
599 | |
883 | /* this avoids any hacking here */ |
600 | /* this avoids any hacking here */ |
884 | |
601 | |
885 | switch (pl->state) |
602 | switch (ns->state) |
886 | { |
603 | { |
887 | case ST_PLAYING: |
604 | case ST_PLAYING: |
888 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
605 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
889 | break; |
606 | break; |
890 | |
607 | |
891 | case ST_PLAY_AGAIN: |
|
|
892 | /* We can check this for return value (2==quit). Maybe we |
|
|
893 | * should, and do something appropriate? |
|
|
894 | */ |
|
|
895 | receive_play_again (pl->ob, buf[0]); |
|
|
896 | break; |
|
|
897 | |
|
|
898 | case ST_ROLL_STAT: |
|
|
899 | key_roll_stat (pl->ob, buf[0]); |
|
|
900 | break; |
|
|
901 | |
|
|
902 | case ST_CHANGE_CLASS: |
|
|
903 | |
|
|
904 | key_change_class (pl->ob, buf[0]); |
|
|
905 | break; |
|
|
906 | |
|
|
907 | case ST_CONFIRM_QUIT: |
|
|
908 | key_confirm_quit (pl->ob, buf[0]); |
|
|
909 | break; |
|
|
910 | |
|
|
911 | case ST_CONFIGURE: |
|
|
912 | LOG (llevError, "In client input handling, but into configure state\n"); |
|
|
913 | pl->state = ST_PLAYING; |
|
|
914 | break; |
|
|
915 | |
|
|
916 | case ST_GET_NAME: |
|
|
917 | receive_player_name (pl->ob, 13); |
|
|
918 | break; |
|
|
919 | |
|
|
920 | case ST_GET_PASSWORD: |
|
|
921 | case ST_CONFIRM_PASSWORD: |
|
|
922 | receive_player_password (pl->ob, 13); |
|
|
923 | break; |
|
|
924 | |
|
|
925 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
608 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
926 | receive_party_password (pl->ob, 13); |
609 | receive_party_password (pl->ob, 13); |
927 | break; |
610 | break; |
928 | |
611 | |
929 | default: |
612 | default: |
930 | LOG (llevError, "Unknown input state: %d\n", pl->state); |
613 | LOG (llevError, "Unknown input state: %d\n", ns->state); |
931 | } |
614 | } |
932 | } |
615 | } |
933 | |
616 | |
934 | /** |
617 | /** |
935 | * Client tells its version. If there is a mismatch, we close the |
618 | * Client tells its version. If there is a mismatch, we close the |
… | |
… | |
937 | * something older than the server. If we assume the client will be |
620 | * something older than the server. If we assume the client will be |
938 | * backwards compatible, having it be a later version should not be a |
621 | * backwards compatible, having it be a later version should not be a |
939 | * problem. |
622 | * problem. |
940 | */ |
623 | */ |
941 | void |
624 | void |
942 | VersionCmd (char *buf, int len, NewSocket * ns) |
625 | VersionCmd (char *buf, int len, client * ns) |
943 | { |
626 | { |
944 | char *cp; |
|
|
945 | char version_warning[256]; |
|
|
946 | |
|
|
947 | if (!buf) |
627 | if (!buf) |
948 | { |
628 | { |
949 | LOG (llevError, "CS: received corrupted version command\n"); |
629 | LOG (llevError, "CS: received corrupted version command\n"); |
950 | return; |
630 | return; |
951 | } |
631 | } |
952 | |
632 | |
953 | ns->cs_version = atoi (buf); |
633 | ns->cs_version = atoi (buf); |
954 | ns->sc_version = ns->cs_version; |
634 | ns->sc_version = ns->cs_version; |
|
|
635 | |
|
|
636 | LOG (llevDebug, "connection from client <%s>\n", buf); |
|
|
637 | |
|
|
638 | //TODO: should log here just for statistics |
|
|
639 | |
955 | if (VERSION_CS != ns->cs_version) |
640 | //if (VERSION_CS != ns->cs_version) |
956 | { |
641 | // unchecked; |
957 | #ifdef ESRV_DEBUG |
642 | |
958 | LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version); |
|
|
959 | #endif |
|
|
960 | } |
|
|
961 | cp = strchr (buf + 1, ' '); |
643 | char *cp = strchr (buf + 1, ' '); |
962 | if (!cp) |
644 | if (!cp) |
963 | return; |
645 | return; |
|
|
646 | |
964 | ns->sc_version = atoi (cp); |
647 | ns->sc_version = atoi (cp); |
|
|
648 | |
965 | if (VERSION_SC != ns->sc_version) |
649 | //if (VERSION_SC != ns->sc_version) |
966 | { |
650 | // unchecked; |
967 | #ifdef ESRV_DEBUG |
651 | |
968 | LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version); |
|
|
969 | #endif |
|
|
970 | } |
|
|
971 | cp = strchr (cp + 1, ' '); |
652 | cp = strchr (cp + 1, ' '); |
|
|
653 | |
972 | if (cp) |
654 | if (cp) |
973 | { |
655 | { |
974 | LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); |
656 | ns->version = cp + 1; |
975 | |
657 | |
976 | snprintf (ns->client, sizeof (ns->client), "%s", cp + 1); |
658 | if (ns->sc_version < 1026) |
977 | |
659 | ns->send_packet_printf ("drawinfo %d %s", NDI_RED, |
978 | /* This is first implementation - i skip all beta DX clients with it |
|
|
979 | * Add later stuff here for other clients |
|
|
980 | */ |
|
|
981 | |
|
|
982 | /* these are old dxclients */ |
|
|
983 | /* Version 1024 added support for singular + plural name values - |
|
|
984 | * requiing this minimal value reduces complexity of that code, and it |
|
|
985 | * has been around for a long time. |
|
|
986 | */ |
|
|
987 | if (!strcmp (" CF DX CLIENT", cp) || ns->sc_version < 1024) |
|
|
988 | { |
|
|
989 | sprintf (version_warning, "drawinfo %d %s", NDI_RED, |
|
|
990 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
660 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
991 | Write_String_To_Socket (ns, version_warning, strlen (version_warning)); |
|
|
992 | } |
|
|
993 | |
|
|
994 | } |
661 | } |
995 | } |
662 | } |
996 | |
663 | |
997 | /** sound related functions. */ |
664 | /** sound related functions. */ |
998 | |
|
|
999 | void |
665 | void |
1000 | SetSound (char *buf, int len, NewSocket * ns) |
666 | SetSound (char *buf, int len, client * ns) |
1001 | { |
667 | { |
1002 | ns->sound = atoi (buf); |
668 | ns->sound = atoi (buf); |
1003 | } |
669 | } |
1004 | |
670 | |
1005 | /** client wants the map resent */ |
671 | /** client wants the map resent */ |
1006 | |
|
|
1007 | void |
672 | void |
1008 | MapRedrawCmd (char *buf, int len, player *pl) |
673 | MapRedrawCmd (char *buf, int len, player *pl) |
1009 | { |
674 | { |
1010 | |
|
|
1011 | /* This function is currently disabled; just clearing the map state results in |
675 | /* This function is currently disabled; just clearing the map state results in |
1012 | * display errors. It should clear the cache and send a newmap command. |
676 | * display errors. It should clear the cache and send a newmap command. |
1013 | * Unfortunately this solution does not work because some client versions send |
677 | * Unfortunately this solution does not work because some client versions send |
1014 | * a mapredraw command after receiving a newmap command. |
678 | * a mapredraw command after receiving a newmap command. |
1015 | */ |
679 | */ |
1016 | #if 0 |
|
|
1017 | /* Okay, this is MAJOR UGLY. but the only way I know how to |
|
|
1018 | * clear the "cache" |
|
|
1019 | */ |
|
|
1020 | memset (&pl->socket.lastmap, 0, sizeof (struct Map)); |
|
|
1021 | draw_client_map (pl->ob); |
|
|
1022 | #endif |
|
|
1023 | } |
680 | } |
1024 | |
681 | |
1025 | /** |
682 | /** |
1026 | * Moves an object (typically, container to inventory). |
683 | * Moves an object (typically, container to inventory). |
1027 | * syntax is: move (to) (tag) (nrof) |
684 | * syntax is: move (to) (tag) (nrof) |
… | |
… | |
1030 | MoveCmd (char *buf, int len, player *pl) |
687 | MoveCmd (char *buf, int len, player *pl) |
1031 | { |
688 | { |
1032 | int vals[3], i; |
689 | int vals[3], i; |
1033 | |
690 | |
1034 | /* A little funky here. We only cycle for 2 records, because |
691 | /* A little funky here. We only cycle for 2 records, because |
1035 | * we obviously am not going to find a space after the third |
692 | * we obviously are not going to find a space after the third |
1036 | * record. Perhaps we should just replace this with a |
693 | * record. Perhaps we should just replace this with a |
1037 | * sscanf? |
694 | * sscanf? |
1038 | */ |
695 | */ |
1039 | for (i = 0; i < 2; i++) |
696 | for (i = 0; i < 2; i++) |
1040 | { |
697 | { |
1041 | vals[i] = atoi (buf); |
698 | vals[i] = atoi (buf); |
|
|
699 | |
1042 | if (!(buf = strchr (buf, ' '))) |
700 | if (!(buf = strchr (buf, ' '))) |
1043 | { |
701 | { |
1044 | LOG (llevError, "Incomplete move command: %s\n", buf); |
702 | LOG (llevError, "Incomplete move command: %s\n", buf); |
1045 | return; |
703 | return; |
1046 | } |
704 | } |
|
|
705 | |
1047 | buf++; |
706 | buf++; |
1048 | } |
707 | } |
|
|
708 | |
1049 | vals[2] = atoi (buf); |
709 | vals[2] = atoi (buf); |
1050 | |
710 | |
1051 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
711 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
1052 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
712 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
1053 | } |
713 | } |
1054 | |
|
|
1055 | |
|
|
1056 | |
714 | |
1057 | /****************************************************************************** |
715 | /****************************************************************************** |
1058 | * |
716 | * |
1059 | * Start of commands the server sends to the client. |
717 | * Start of commands the server sends to the client. |
1060 | * |
718 | * |
… | |
… | |
1063 | /** |
721 | /** |
1064 | * Asks the client to query the user. This way, the client knows |
722 | * Asks the client to query the user. This way, the client knows |
1065 | * it needs to send something back (vs just printing out a message) |
723 | * it needs to send something back (vs just printing out a message) |
1066 | */ |
724 | */ |
1067 | void |
725 | void |
1068 | send_query (NewSocket * ns, uint8 flags, char *text) |
726 | send_query (client *ns, uint8 flags, const char *text) |
1069 | { |
727 | { |
1070 | char buf[MAX_BUF]; |
|
|
1071 | |
|
|
1072 | sprintf (buf, "query %d %s", flags, text ? text : ""); |
728 | ns->send_packet_printf ("query %d %s", flags, text ? text : ""); |
1073 | Write_String_To_Socket (ns, buf, strlen (buf)); |
729 | } |
|
|
730 | |
|
|
731 | /** |
|
|
732 | * Get player's current range attack in obuf. |
|
|
733 | */ |
|
|
734 | static void |
|
|
735 | rangetostring (player *pl, char *obuf) |
|
|
736 | { |
|
|
737 | dynbuf_text buf; |
|
|
738 | |
|
|
739 | if (pl->ranged_ob) |
|
|
740 | buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; |
|
|
741 | |
|
|
742 | if (pl->combat_ob) |
|
|
743 | buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; |
|
|
744 | |
|
|
745 | //TODO: maybe golem should become the current_weapon, quite simply? |
|
|
746 | if (pl->golem) |
|
|
747 | buf << " Golem*: " << pl->golem->name; |
|
|
748 | |
|
|
749 | buf.linearise (obuf); |
|
|
750 | obuf [buf.size ()] = 0; |
1074 | } |
751 | } |
1075 | |
752 | |
1076 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
753 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1077 | Old = New; \ |
754 | Old = New; \ |
1078 | SockList_AddChar(&sl, Type); \ |
755 | sl << uint8 (Type) << uint64 (New); \ |
1079 | SockList_AddInt64(&sl, New); \ |
|
|
1080 | } |
756 | } |
1081 | |
757 | |
1082 | #define AddIfInt(Old,New,Type) if (Old != New) {\ |
758 | #define AddIfInt(Old,New,Type) if (Old != New) {\ |
1083 | Old = New; \ |
759 | Old = New; \ |
1084 | SockList_AddChar(&sl, Type); \ |
760 | sl << uint8 (Type) << uint32 (New); \ |
1085 | SockList_AddInt(&sl, New); \ |
|
|
1086 | } |
761 | } |
1087 | |
762 | |
1088 | #define AddIfShort(Old,New,Type) if (Old != New) {\ |
763 | #define AddIfShort(Old,New,Type) if (Old != New) {\ |
1089 | Old = New; \ |
764 | Old = New; \ |
1090 | SockList_AddChar(&sl, Type); \ |
765 | sl << uint8 (Type) << uint16 (New); \ |
1091 | SockList_AddShort(&sl, New); \ |
|
|
1092 | } |
766 | } |
1093 | |
767 | |
1094 | #define AddIfFloat(Old,New,Type) if (Old != New) {\ |
768 | #define AddIfFloat(Old,New,Type) if (Old != New) {\ |
1095 | Old = New; \ |
769 | Old = New; \ |
1096 | SockList_AddChar(&sl, Type); \ |
770 | sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ |
1097 | SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\ |
|
|
1098 | } |
771 | } |
1099 | |
772 | |
1100 | #define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ |
773 | #define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ |
1101 | if (Old) free(Old);\ |
|
|
1102 | Old = strdup_local(New);\ |
774 | free(Old); Old = strdup (New);\ |
1103 | SockList_AddChar(&sl, Type); \ |
775 | sl << uint8 (Type) << data8 (New); \ |
1104 | SockList_AddChar(&sl, ( char )strlen(New)); \ |
|
|
1105 | strcpy((char*)sl.buf + sl.len, New); \ |
|
|
1106 | sl.len += strlen(New); \ |
|
|
1107 | } |
776 | } |
1108 | |
777 | |
1109 | /** |
778 | /** |
1110 | * Sends a statistics update. We look at the old values, |
779 | * Sends a statistics update. We look at the old values, |
1111 | * and only send what has changed. Stat mapping values are in newclient.h |
780 | * and only send what has changed. Stat mapping values are in newclient.h |
… | |
… | |
1113 | * commands for now. |
782 | * commands for now. |
1114 | */ |
783 | */ |
1115 | void |
784 | void |
1116 | esrv_update_stats (player *pl) |
785 | esrv_update_stats (player *pl) |
1117 | { |
786 | { |
1118 | SockList sl; |
|
|
1119 | char buf[MAX_BUF]; |
787 | char buf[MAX_BUF]; |
1120 | uint16 flags; |
788 | uint16 flags; |
1121 | |
789 | |
1122 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
790 | client *ns = pl->ns; |
1123 | strcpy ((char *) sl.buf, "stats "); |
791 | if (!ns) |
1124 | sl.len = strlen ((char *) sl.buf); |
792 | return; |
1125 | |
793 | |
1126 | if (pl->ob != NULL) |
794 | object *ob = pl->ob; |
1127 | { |
795 | if (!ob) |
|
|
796 | return; |
|
|
797 | |
|
|
798 | packet sl ("stats"); |
|
|
799 | |
1128 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
800 | AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); |
1129 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
801 | AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); |
1130 | AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); |
802 | AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP); |
1131 | AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); |
803 | AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP); |
1132 | AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); |
804 | AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE); |
1133 | AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); |
805 | AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE); |
1134 | AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); |
806 | AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR); |
1135 | AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); |
|
|
1136 | AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); |
|
|
1137 | AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); |
|
|
1138 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
807 | AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX); |
1139 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
808 | AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON); |
|
|
809 | AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); |
|
|
810 | AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); |
|
|
811 | AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); |
1140 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
812 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
1141 | } |
|
|
1142 | if (pl->socket.exp64) |
|
|
1143 | { |
|
|
1144 | uint8 s; |
|
|
1145 | |
813 | |
1146 | for (s = 0; s < NUM_SKILLS; s++) |
814 | for (int s = 0; s < NUM_SKILLS; s++) |
|
|
815 | if (object *skill = pl->last_skill_ob[s]) |
|
|
816 | if (skill->stats.exp != ns->last_skill_exp [s]) |
1147 | { |
817 | { |
1148 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
818 | ns->last_skill_exp [s] = skill->stats.exp; |
1149 | { |
|
|
1150 | |
819 | |
1151 | /* Always send along the level if exp changes. This is only |
820 | /* Always send along the level if exp changes. This is only |
1152 | * 1 extra byte, but keeps processing simpler. |
821 | * 1 extra byte, but keeps processing simpler. |
1153 | */ |
822 | */ |
1154 | SockList_AddChar (&sl, (char) (s + CS_STAT_SKILLINFO)); |
823 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1155 | SockList_AddChar (&sl, (char) pl->last_skill_ob[s]->level); |
824 | << uint8 (skill->level) |
1156 | SockList_AddInt64 (&sl, pl->last_skill_ob[s]->stats.exp); |
825 | << uint64 (skill->stats.exp); |
1157 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
|
|
1158 | } |
|
|
1159 | } |
826 | } |
1160 | } |
827 | |
1161 | if (pl->socket.exp64) |
|
|
1162 | { |
|
|
1163 | AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); |
828 | AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); |
1164 | } |
|
|
1165 | else |
|
|
1166 | { |
|
|
1167 | AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP); |
|
|
1168 | } |
|
|
1169 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
829 | AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); |
1170 | AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); |
830 | AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); |
1171 | AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); |
831 | AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); |
1172 | AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); |
832 | AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); |
1173 | AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); |
833 | AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); |
1174 | AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); |
834 | AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); |
1175 | AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); |
835 | AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); |
1176 | AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); |
836 | AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); |
|
|
837 | |
1177 | flags = 0; |
838 | flags = 0; |
|
|
839 | |
1178 | if (pl->fire_on) |
840 | if (pl->fire_on) |
1179 | flags |= SF_FIREON; |
841 | flags |= SF_FIREON; |
|
|
842 | |
1180 | if (pl->run_on) |
843 | if (pl->run_on) |
1181 | flags |= SF_RUNON; |
844 | flags |= SF_RUNON; |
1182 | |
845 | |
1183 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
846 | AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); |
|
|
847 | |
1184 | if (pl->socket.sc_version < 1025) |
848 | if (ns->sc_version < 1025) |
1185 | { |
|
|
1186 | AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR); |
849 | { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1187 | } |
|
|
1188 | else |
850 | else |
1189 | { |
|
|
1190 | int i; |
|
|
1191 | |
|
|
1192 | for (i = 0; i < NROFATTACKS; i++) |
851 | for (int i = 0; i < NROFATTACKS; i++) |
1193 | { |
852 | { |
1194 | /* Skip ones we won't send */ |
853 | /* Skip ones we won't send */ |
1195 | if (atnr_cs_stat[i] == -1) |
854 | if (atnr_cs_stat[i] == -1) |
1196 | continue; |
855 | continue; |
|
|
856 | |
1197 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
857 | AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); |
1198 | } |
858 | } |
1199 | } |
859 | |
1200 | if (pl->socket.monitor_spells) |
860 | if (pl->ns->monitor_spells) |
1201 | { |
861 | { |
1202 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
862 | AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1203 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
863 | AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); |
1204 | AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); |
864 | AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); |
1205 | } |
865 | } |
|
|
866 | |
1206 | rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ |
867 | rangetostring (pl, buf); /* we want use the new fire & run system in new client */ |
1207 | AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); |
868 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
1208 | set_title (pl->ob, buf); |
869 | set_title (ob, buf); |
1209 | AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); |
870 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
1210 | |
871 | |
1211 | /* Only send it away if we have some actual data */ |
872 | /* Only send it away if we have some actual data */ |
1212 | if (sl.len > 6) |
873 | if (sl.length () > 6) |
1213 | { |
874 | ns->send_packet (sl); |
1214 | #ifdef ESRV_DEBUG |
|
|
1215 | LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len); |
|
|
1216 | #endif |
|
|
1217 | Send_With_Handling (&pl->socket, &sl); |
|
|
1218 | } |
|
|
1219 | free (sl.buf); |
|
|
1220 | } |
875 | } |
1221 | |
|
|
1222 | |
876 | |
1223 | /** |
877 | /** |
1224 | * Tells the client that here is a player it should start using. |
878 | * Tells the client that here is a player it should start using. |
1225 | */ |
879 | */ |
1226 | void |
880 | void |
1227 | esrv_new_player (player *pl, uint32 weight) |
881 | esrv_new_player (player *pl, uint32 weight) |
1228 | { |
882 | { |
1229 | SockList sl; |
883 | packet sl ("player"); |
1230 | |
884 | |
|
|
885 | sl << uint32 (pl->ob->count) |
|
|
886 | << uint32 (weight) |
|
|
887 | << uint32 (pl->ob->face) |
|
|
888 | << data8 (pl->ob->name); |
|
|
889 | |
1231 | pl->last_weight = weight; |
890 | pl->ns->last_weight = weight; |
1232 | |
891 | pl->ns->send_packet (sl); |
1233 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
|
|
1234 | |
|
|
1235 | strcpy ((char *) sl.buf, "player "); |
|
|
1236 | sl.len = strlen ((char *) sl.buf); |
|
|
1237 | SockList_AddInt (&sl, pl->ob->count); |
|
|
1238 | SockList_AddInt (&sl, weight); |
|
|
1239 | SockList_AddInt (&sl, pl->ob->face->number); |
|
|
1240 | |
|
|
1241 | SockList_AddChar (&sl, (char) strlen (pl->ob->name)); |
|
|
1242 | strcpy ((char *) sl.buf + sl.len, pl->ob->name); |
|
|
1243 | sl.len += strlen (pl->ob->name); |
|
|
1244 | |
|
|
1245 | Send_With_Handling (&pl->socket, &sl); |
|
|
1246 | free (sl.buf); |
|
|
1247 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
892 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1248 | } |
893 | } |
1249 | |
|
|
1250 | |
|
|
1251 | /** |
|
|
1252 | * Need to send an animation sequence to the client. |
|
|
1253 | * We will send appropriate face commands to the client if we haven't |
|
|
1254 | * sent them the face yet (this can become quite costly in terms of |
|
|
1255 | * how much we are sending - on the other hand, this should only happen |
|
|
1256 | * when the player logs in and picks stuff up. |
|
|
1257 | */ |
|
|
1258 | void |
|
|
1259 | esrv_send_animation (NewSocket * ns, short anim_num) |
|
|
1260 | { |
|
|
1261 | SockList sl; |
|
|
1262 | int i; |
|
|
1263 | |
|
|
1264 | /* Do some checking on the anim_num we got. Note that the animations |
|
|
1265 | * are added in contigous order, so if the number is in the valid |
|
|
1266 | * range, it must be a valid animation. |
|
|
1267 | */ |
|
|
1268 | if (anim_num < 0 || anim_num > num_animations) |
|
|
1269 | { |
|
|
1270 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
|
|
1271 | return; |
|
|
1272 | } |
|
|
1273 | |
|
|
1274 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
|
|
1275 | strcpy ((char *) sl.buf, "anim "); |
|
|
1276 | sl.len = 5; |
|
|
1277 | SockList_AddShort (&sl, anim_num); |
|
|
1278 | SockList_AddShort (&sl, 0); /* flags - not used right now */ |
|
|
1279 | /* Build up the list of faces. Also, send any information (ie, the |
|
|
1280 | * the face itself) down to the client. |
|
|
1281 | */ |
|
|
1282 | for (i = 0; i < animations[anim_num].num_animations; i++) |
|
|
1283 | { |
|
|
1284 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
|
|
1285 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
|
|
1286 | SockList_AddShort (&sl, animations[anim_num].faces[i]); /* flags - not used right now */ |
|
|
1287 | } |
|
|
1288 | Send_With_Handling (ns, &sl); |
|
|
1289 | free (sl.buf); |
|
|
1290 | ns->anims_sent[anim_num] = 1; |
|
|
1291 | } |
|
|
1292 | |
|
|
1293 | |
894 | |
1294 | /****************************************************************************** |
895 | /****************************************************************************** |
1295 | * |
896 | * |
1296 | * Start of map related commands. |
897 | * Start of map related commands. |
1297 | * |
898 | * |
1298 | ******************************************************************************/ |
899 | ******************************************************************************/ |
1299 | |
900 | |
1300 | /** |
|
|
1301 | * This adds face_num to a map cell at x,y. If the client doesn't have |
|
|
1302 | * the face yet, we will also send it. |
|
|
1303 | */ |
|
|
1304 | static void |
|
|
1305 | esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap) |
|
|
1306 | { |
|
|
1307 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
|
|
1308 | { |
|
|
1309 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
|
|
1310 | return; |
|
|
1311 | abort (); |
|
|
1312 | } |
|
|
1313 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
|
|
1314 | newmap->cells[x][y].count++; |
|
|
1315 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
|
|
1316 | esrv_send_face (ns, face_num, 0); |
|
|
1317 | } |
|
|
1318 | |
|
|
1319 | struct LayerCell |
|
|
1320 | { |
|
|
1321 | uint16 xy; |
|
|
1322 | short face; |
|
|
1323 | }; |
|
|
1324 | |
|
|
1325 | struct MapLayer |
|
|
1326 | { |
|
|
1327 | int count; |
|
|
1328 | struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; |
|
|
1329 | }; |
|
|
1330 | |
|
|
1331 | /** Checkes if map cells have changed */ |
|
|
1332 | static int |
|
|
1333 | mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap) |
|
|
1334 | { |
|
|
1335 | int k; |
|
|
1336 | |
|
|
1337 | if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) |
|
|
1338 | return 1; |
|
|
1339 | for (k = 0; k < newmap->cells[i][j].count; k++) |
|
|
1340 | { |
|
|
1341 | if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k]) |
|
|
1342 | { |
|
|
1343 | return 1; |
|
|
1344 | } |
|
|
1345 | } |
|
|
1346 | return 0; |
|
|
1347 | } |
|
|
1348 | |
|
|
1349 | /** |
|
|
1350 | * Basically, what this does is pack the data into layers. |
|
|
1351 | * cnum is the client number, cur is the the buffer we put all of |
|
|
1352 | * this data into. we return the end of the data. layers is |
|
|
1353 | * how many layers of data we should back. |
|
|
1354 | */ |
|
|
1355 | static uint8 * |
|
|
1356 | compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap) |
|
|
1357 | { |
|
|
1358 | int x, y, k; |
|
|
1359 | int face; |
|
|
1360 | unsigned char *fcur; |
|
|
1361 | struct MapLayer layers[MAP_LAYERS]; |
|
|
1362 | |
|
|
1363 | for (k = 0; k < MAP_LAYERS; k++) |
|
|
1364 | layers[k].count = 0; |
|
|
1365 | fcur = cur; |
|
|
1366 | for (x = 0; x < ns->mapx; x++) |
|
|
1367 | { |
|
|
1368 | for (y = 0; y < ns->mapy; y++) |
|
|
1369 | { |
|
|
1370 | if (!mapcellchanged (ns, x, y, newmap)) |
|
|
1371 | continue; |
|
|
1372 | if (newmap->cells[x][y].count == 0) |
|
|
1373 | { |
|
|
1374 | *cur = x * ns->mapy + y; /* mark empty space */ |
|
|
1375 | cur++; |
|
|
1376 | continue; |
|
|
1377 | } |
|
|
1378 | for (k = 0; k < newmap->cells[x][y].count; k++) |
|
|
1379 | { |
|
|
1380 | layers[k].lcells[layers[k].count].xy = x * ns->mapy + y; |
|
|
1381 | layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k]; |
|
|
1382 | layers[k].count++; |
|
|
1383 | } |
|
|
1384 | } |
|
|
1385 | } |
|
|
1386 | /* If no data, return now. */ |
|
|
1387 | if (fcur == cur && layers[0].count == 0) |
|
|
1388 | return cur; |
|
|
1389 | *cur = 255; /* mark end of explicitly cleared cells */ |
|
|
1390 | cur++; |
|
|
1391 | /* First pack by layers. */ |
|
|
1392 | for (k = 0; k < numlayers; k++) |
|
|
1393 | { |
|
|
1394 | if (layers[k].count == 0) |
|
|
1395 | break; /* once a layer is entirely empty, no layer below it can |
|
|
1396 | have anything in it either */ |
|
|
1397 | /* Pack by entries in thie layer */ |
|
|
1398 | for (x = 0; x < layers[k].count;) |
|
|
1399 | { |
|
|
1400 | fcur = cur; |
|
|
1401 | *cur = layers[k].lcells[x].face >> 8; |
|
|
1402 | cur++; |
|
|
1403 | *cur = layers[k].lcells[x].face & 0xFF; |
|
|
1404 | cur++; |
|
|
1405 | face = layers[k].lcells[x].face; |
|
|
1406 | /* Now, we back the redundant data into 1 byte xy pairings */ |
|
|
1407 | for (y = x; y < layers[k].count; y++) |
|
|
1408 | { |
|
|
1409 | if (layers[k].lcells[y].face == face) |
|
|
1410 | { |
|
|
1411 | *cur = (uint8) layers[k].lcells[y].xy; |
|
|
1412 | cur++; |
|
|
1413 | layers[k].lcells[y].face = -1; |
|
|
1414 | } |
|
|
1415 | } |
|
|
1416 | *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */ |
|
|
1417 | /* forward over the now redundant data */ |
|
|
1418 | while (x < layers[k].count && layers[k].lcells[x].face == -1) |
|
|
1419 | x++; |
|
|
1420 | } |
|
|
1421 | *fcur = *fcur | 128; /* mark for end of faces at this layer */ |
|
|
1422 | } |
|
|
1423 | return cur; |
|
|
1424 | } |
|
|
1425 | |
|
|
1426 | static void |
|
|
1427 | esrv_map_doneredraw (NewSocket * ns, struct Map *newmap) |
|
|
1428 | { |
|
|
1429 | static long frames, bytes, tbytes, tframes; |
|
|
1430 | char *cur; |
|
|
1431 | SockList sl; |
|
|
1432 | |
|
|
1433 | |
|
|
1434 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
|
|
1435 | strcpy ((char *) sl.buf, "map "); |
|
|
1436 | sl.len = strlen ((char *) sl.buf); |
|
|
1437 | |
|
|
1438 | cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap); |
|
|
1439 | sl.len = cur - (char *) sl.buf; |
|
|
1440 | |
|
|
1441 | /* LOG(llevDebug, "Sending map command.\n");*/ |
|
|
1442 | |
|
|
1443 | if (sl.len > (int) strlen ("map ") || ns->sent_scroll) |
|
|
1444 | { |
|
|
1445 | /* All of this is just accounting stuff */ |
|
|
1446 | if (tframes > 100) |
|
|
1447 | tframes = tbytes = 0; |
|
|
1448 | |
|
|
1449 | tframes++; |
|
|
1450 | frames++; |
|
|
1451 | tbytes += sl.len; |
|
|
1452 | bytes += sl.len; |
|
|
1453 | memcpy (&ns->lastmap, newmap, sizeof (struct Map)); |
|
|
1454 | Send_With_Handling (ns, &sl); |
|
|
1455 | ns->sent_scroll = 0; |
|
|
1456 | } |
|
|
1457 | |
|
|
1458 | free (sl.buf); |
|
|
1459 | } |
|
|
1460 | |
|
|
1461 | |
|
|
1462 | /** Clears a map cell */ |
901 | /** Clears a map cell */ |
1463 | static void |
902 | static void |
1464 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
903 | map_clearcell (struct MapCell *cell, int count) |
1465 | { |
904 | { |
1466 | cell->faces[0] = face0; |
905 | cell->faces[0] = 0; |
1467 | cell->faces[1] = face1; |
906 | cell->faces[1] = 0; |
1468 | cell->faces[2] = face2; |
907 | cell->faces[2] = 0; |
|
|
908 | cell->smooth[0] = 0; |
|
|
909 | cell->smooth[1] = 0; |
|
|
910 | cell->smooth[2] = 0; |
1469 | cell->count = count; |
911 | cell->count = count; |
1470 | cell->stat_hp = 0; |
912 | cell->stat_hp = 0; |
|
|
913 | cell->flags = 0; |
1471 | cell->player = 0; |
914 | cell->player = 0; |
1472 | } |
915 | } |
1473 | |
916 | |
1474 | #define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) |
|
|
1475 | #define MAX_LAYERS 3 |
917 | #define MAX_LAYERS 3 |
1476 | |
|
|
1477 | /* Using a global really isn't a good approach, but saves the over head of |
|
|
1478 | * allocating and deallocating such a block of data each time run through, |
|
|
1479 | * and saves the space of allocating this in the socket object when we only |
|
|
1480 | * need it for this cycle. If the serve is ever threaded, this needs to be |
|
|
1481 | * re-examined. |
|
|
1482 | */ |
|
|
1483 | |
|
|
1484 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
|
|
1485 | |
|
|
1486 | /** |
|
|
1487 | * Returns true if any of the heads for this |
|
|
1488 | * space is set. Returns false if all are blank - this is used |
|
|
1489 | * for empty space checking. |
|
|
1490 | */ |
|
|
1491 | static inline int |
|
|
1492 | have_head (int ax, int ay) |
|
|
1493 | { |
|
|
1494 | |
|
|
1495 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
|
|
1496 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) |
|
|
1497 | return 1; |
|
|
1498 | return 0; |
|
|
1499 | } |
|
|
1500 | |
|
|
1501 | /** |
|
|
1502 | * check_head is a bit simplistic version of update_space below. |
|
|
1503 | * basically, it only checks the that the head on space ax,ay at layer |
|
|
1504 | * needs to get sent - if so, it adds the data, sending the head |
|
|
1505 | * if needed, and returning 1. If this no data needs to get |
|
|
1506 | * sent, it returns zero. |
|
|
1507 | */ |
|
|
1508 | static int |
|
|
1509 | check_head (SockList & sl, NewSocket & ns, int ax, int ay, int layer) |
|
|
1510 | { |
|
|
1511 | short face_num; |
|
|
1512 | |
|
|
1513 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
|
|
1514 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
|
|
1515 | else |
|
|
1516 | face_num = 0; |
|
|
1517 | |
|
|
1518 | if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) |
|
|
1519 | { |
|
|
1520 | SockList_AddShort (&sl, face_num); |
|
|
1521 | if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
|
|
1522 | esrv_send_face (&ns, face_num, 0); |
|
|
1523 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; |
|
|
1524 | ns.lastmap.cells[ax][ay].faces[layer] = face_num; |
|
|
1525 | return 1; |
|
|
1526 | } |
|
|
1527 | |
|
|
1528 | return 0; /* No change */ |
|
|
1529 | } |
|
|
1530 | |
918 | |
1531 | /** |
919 | /** |
1532 | * Removes the need to replicate the same code for each layer. |
920 | * Removes the need to replicate the same code for each layer. |
1533 | * this returns true if this space is now in fact different than |
921 | * this returns true if this space is now in fact different than |
1534 | * it was. |
922 | * it was. |
1535 | * sl is the socklist this data is going into. |
923 | * sl is the socklist this data is going into. |
1536 | * ns is the socket we are working on - all the info we care |
924 | * ns is the socket we are working on - all the info we care |
1537 | * about is in this socket structure, so now need not pass the |
925 | * about is in this socket structure, so now need not pass the |
1538 | * entire player object. |
926 | * entire player object. |
1539 | * mx and my are map coordinate offsets for map mp |
|
|
1540 | * sx and sy are the offsets into the socket structure that |
|
|
1541 | * holds the old values. |
|
|
1542 | * layer is the layer to update, with 2 being the floor and 0 the |
927 | * layer is the layer to update, with 2 being the floor and 0 the |
1543 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) |
928 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) |
1544 | * take. Interesting to note that before this function, the map1 function |
929 | * take. Interesting to note that before this function, the map1 function |
1545 | * numbers the spaces differently - I think this was a leftover from |
930 | * numbers the spaces differently - I think this was a leftover from |
1546 | * the map command, where the faces stack up. Sinces that is no longer |
931 | * the map command, where the faces stack up. Sinces that is no longer |
1547 | * the case, it seems to make more sense to have these layer values |
932 | * the case, it seems to make more sense to have these layer values |
1548 | * actually match. |
933 | * actually match. |
1549 | */ |
934 | */ |
1550 | |
|
|
1551 | static int |
935 | static int |
1552 | update_space (SockList * sl, NewSocket * ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer) |
936 | update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer) |
1553 | { |
937 | { |
1554 | object *ob, *head; |
938 | object *ob = ms.faces_obj [layer]; |
1555 | uint16 face_num; |
|
|
1556 | int bx, by, i; |
|
|
1557 | |
|
|
1558 | /* If there is a multipart object stored away, treat that as more important. |
|
|
1559 | * If not, then do the normal processing. |
|
|
1560 | */ |
|
|
1561 | |
|
|
1562 | head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; |
|
|
1563 | |
|
|
1564 | /* Check to see if this head is part of the set of objects |
|
|
1565 | * we would normally send for this space. If so, then |
|
|
1566 | * don't use the head value. We need to do the check |
|
|
1567 | * here and not when setting up the heads[] value for two reasons - |
|
|
1568 | * 1) the heads[] values will get used even if the space is not visible. |
|
|
1569 | * 2) its possible the head is not on the same map as a part, and I'd |
|
|
1570 | * rather not need to do the map translation overhead. |
|
|
1571 | * 3) We need to do some extra checking to make sure that we will |
|
|
1572 | * otherwise send the image as this layer, eg, either it matches |
|
|
1573 | * the head value, or is not multipart. |
|
|
1574 | */ |
|
|
1575 | if (head && !head->more) |
|
|
1576 | { |
|
|
1577 | for (i = 0; i < MAP_LAYERS; i++) |
|
|
1578 | { |
|
|
1579 | ob = GET_MAP_FACE_OBJ (mp, mx, my, i); |
|
|
1580 | if (!ob) |
|
|
1581 | continue; |
|
|
1582 | |
|
|
1583 | if (ob->head) |
|
|
1584 | ob = ob->head; |
|
|
1585 | |
|
|
1586 | if (ob == head) |
|
|
1587 | { |
|
|
1588 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL; |
|
|
1589 | head = NULL; |
|
|
1590 | break; |
|
|
1591 | } |
|
|
1592 | } |
|
|
1593 | } |
|
|
1594 | |
|
|
1595 | ob = head; |
|
|
1596 | if (!ob) |
|
|
1597 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
|
|
1598 | |
939 | |
1599 | /* If there is no object for this space, or if the face for the object |
940 | /* If there is no object for this space, or if the face for the object |
1600 | * is the blank face, set the face number to zero. |
941 | * is the blank face, set the face number to zero. |
1601 | * else if we have the stored head object for this space, that takes |
942 | * else if we have the stored head object for this space, that takes |
1602 | * precedence over the other object for this space. |
943 | * precedence over the other object for this space. |
1603 | * otherwise, we do special head processing |
944 | * otherwise, we do special head processing |
1604 | */ |
945 | */ |
1605 | if (!ob || ob->face == blank_face) |
946 | uint16 face_num = ob && ob->face != blank_face ? ob->face : 0; |
1606 | face_num = 0; |
|
|
1607 | else if (head) |
|
|
1608 | { |
|
|
1609 | /* if this is a head that had previously been stored */ |
|
|
1610 | face_num = ob->face->number; |
|
|
1611 | } |
|
|
1612 | else |
|
|
1613 | { |
|
|
1614 | /* if the faces for the different parts of a multipart object |
|
|
1615 | * are the same, we only want to send the bottom right most |
|
|
1616 | * portion of the object. That info is in the tail_.. values |
|
|
1617 | * of the head. Note that for the head itself, ob->head will |
|
|
1618 | * be null, so we only do this block if we are working on |
|
|
1619 | * a tail piece. |
|
|
1620 | */ |
|
|
1621 | |
|
|
1622 | /* tail_x and tail_y will only be set in the head object. If |
|
|
1623 | * this is the head object and these are set, we proceed |
|
|
1624 | * with logic to only send bottom right. Similarly, if |
|
|
1625 | * this is one of the more parts but the head has those values |
|
|
1626 | * set, we want to do the processing. There can be cases where |
|
|
1627 | * the head is not visible but one of its parts is, so we just |
|
|
1628 | * can always expect that ob->arch->tail_x will be true for all |
|
|
1629 | * object we may want to display. |
|
|
1630 | */ |
|
|
1631 | if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y))) |
|
|
1632 | { |
|
|
1633 | |
|
|
1634 | if (ob->head) |
|
|
1635 | head = ob->head; |
|
|
1636 | else |
|
|
1637 | head = ob; |
|
|
1638 | |
|
|
1639 | /* Basically figure out where the offset is from where we are right |
|
|
1640 | * now. the ob->arch->clone.{x,y} values hold the offset that this current |
|
|
1641 | * piece is from the head, and the tail is where the tail is from the |
|
|
1642 | * head. Note that bx and by will equal sx and sy if we are already working |
|
|
1643 | * on the bottom right corner. If ob is the head, the clone values |
|
|
1644 | * will be zero, so the right thing will still happen. |
|
|
1645 | */ |
|
|
1646 | bx = sx + head->arch->tail_x - ob->arch->clone.x; |
|
|
1647 | by = sy + head->arch->tail_y - ob->arch->clone.y; |
|
|
1648 | |
|
|
1649 | /* I don't think this can ever happen, but better to check for it just |
|
|
1650 | * in case. |
|
|
1651 | */ |
|
|
1652 | if (bx < sx || by < sy) |
|
|
1653 | { |
|
|
1654 | LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy); |
|
|
1655 | face_num = 0; |
|
|
1656 | } |
|
|
1657 | /* single part object, multipart object with non merged faces, |
|
|
1658 | * of multipart object already at lower right. |
|
|
1659 | */ |
|
|
1660 | else if (bx == sx && by == sy) |
|
|
1661 | { |
|
|
1662 | face_num = ob->face->number; |
|
|
1663 | |
|
|
1664 | /* if this face matches one stored away, clear that one away. |
|
|
1665 | * this code relies on the fact that the map1 commands |
|
|
1666 | * goes from 2 down to 0. |
|
|
1667 | */ |
|
|
1668 | for (i = 0; i < MAP_LAYERS; i++) |
|
|
1669 | if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] && |
|
|
1670 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num) |
|
|
1671 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL; |
|
|
1672 | } |
|
|
1673 | else |
|
|
1674 | { |
|
|
1675 | /* If this head is stored away, clear it - otherwise, |
|
|
1676 | * there can be cases where a object is on multiple layers - |
|
|
1677 | * we only want to send it once. |
|
|
1678 | */ |
|
|
1679 | face_num = head->face->number; |
|
|
1680 | for (i = 0; i < MAP_LAYERS; i++) |
|
|
1681 | if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] && |
|
|
1682 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num) |
|
|
1683 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL; |
|
|
1684 | |
|
|
1685 | /* First, try to put the new head on the same layer. If that is used up, |
|
|
1686 | * then find another layer. |
|
|
1687 | */ |
|
|
1688 | if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL) |
|
|
1689 | { |
|
|
1690 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head; |
|
|
1691 | } |
|
|
1692 | else |
|
|
1693 | for (i = 0; i < MAX_LAYERS; i++) |
|
|
1694 | { |
|
|
1695 | if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL || |
|
|
1696 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head) |
|
|
1697 | { |
|
|
1698 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head; |
|
|
1699 | } |
|
|
1700 | } |
|
|
1701 | face_num = 0; /* Don't send this object - we'll send the head later */ |
|
|
1702 | } |
|
|
1703 | } |
|
|
1704 | else |
|
|
1705 | { |
|
|
1706 | /* In this case, we are already at the lower right or single part object, |
|
|
1707 | * so nothing special |
|
|
1708 | */ |
|
|
1709 | face_num = ob->face->number; |
|
|
1710 | |
|
|
1711 | /* clear out any head entries that have the same face as this one */ |
|
|
1712 | for (bx = 0; bx < layer; bx++) |
|
|
1713 | if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] && |
|
|
1714 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num) |
|
|
1715 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL; |
|
|
1716 | } |
|
|
1717 | } /* else not already head object or blank face */ |
|
|
1718 | |
|
|
1719 | /* This is a real hack. Basically, if we have nothing to send for this layer, |
|
|
1720 | * but there is a head on the next layer, send that instead. |
|
|
1721 | * Without this, what happens is you can get the case where the player stands |
|
|
1722 | * on the same space as the head. However, if you have overlapping big objects |
|
|
1723 | * of the same type, what happens then is it doesn't think it needs to send |
|
|
1724 | * This tends to make stacking also work/look better. |
|
|
1725 | */ |
|
|
1726 | if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]) |
|
|
1727 | { |
|
|
1728 | face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number; |
|
|
1729 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL; |
|
|
1730 | } |
|
|
1731 | |
|
|
1732 | /* Another hack - because of heads and whatnot, this face may match one |
|
|
1733 | * we already sent for a lower layer. In that case, don't send |
|
|
1734 | * this one. |
|
|
1735 | */ |
|
|
1736 | if (face_num && layer + 1 < MAP_LAYERS && ns->lastmap.cells[sx][sy].faces[layer + 1] == face_num) |
|
|
1737 | { |
|
|
1738 | face_num = 0; |
|
|
1739 | } |
|
|
1740 | |
947 | |
1741 | /* We've gotten what face we want to use for the object. Now see if |
948 | /* We've gotten what face we want to use for the object. Now see if |
1742 | * if it has changed since we last sent it to the client. |
949 | * if it has changed since we last sent it to the client. |
1743 | */ |
950 | */ |
1744 | if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) |
951 | if (lastcell.faces[layer] != face_num) |
1745 | { |
952 | { |
1746 | ns->lastmap.cells[sx][sy].faces[layer] = face_num; |
953 | lastcell.faces[layer] = face_num; |
1747 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
954 | |
|
|
955 | if (!ns.faces_sent[face_num]) |
|
|
956 | if (ob) |
|
|
957 | ns.send_faces (ob); |
|
|
958 | else |
1748 | esrv_send_face (ns, face_num, 0); |
959 | ns.send_face (face_num); |
1749 | SockList_AddShort (sl, face_num); |
960 | |
|
|
961 | sl << uint16 (face_num); |
1750 | return 1; |
962 | return 1; |
1751 | } |
963 | } |
1752 | /* Nothing changed */ |
|
|
1753 | return 0; |
|
|
1754 | } |
|
|
1755 | |
964 | |
1756 | /** |
|
|
1757 | * This function is mainly a copy of update_space, |
|
|
1758 | * except it handles update of the smoothing updates, |
|
|
1759 | * not the face updates. |
|
|
1760 | * Removes the need to replicate the same code for each layer. |
|
|
1761 | * this returns true if this smooth is now in fact different |
|
|
1762 | * than it was. |
|
|
1763 | * sl is the socklist this data is going into. |
|
|
1764 | * ns is the socket we are working on - all the info we care |
|
|
1765 | * about is in this socket structure, so know need to pass the |
|
|
1766 | * entire player object. |
|
|
1767 | * mx and my are map coordinate offsets for map mp |
|
|
1768 | * sx and sy are the offsets into the socket structure that |
|
|
1769 | * holds the old values. |
|
|
1770 | * layer is the layer to update, with 2 being the floor and 0 the |
|
|
1771 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
|
|
1772 | * take. |
|
|
1773 | */ |
|
|
1774 | |
|
|
1775 | static inline int |
|
|
1776 | update_smooth (SockList * sl, NewSocket * ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer) |
|
|
1777 | { |
|
|
1778 | object *ob; |
|
|
1779 | int smoothlevel; /* old face_num; */ |
|
|
1780 | |
|
|
1781 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
|
|
1782 | |
|
|
1783 | /* If there is no object for this space, or if the face for the object |
|
|
1784 | * is the blank face, set the smoothlevel to zero. |
|
|
1785 | */ |
|
|
1786 | if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) |
|
|
1787 | smoothlevel = 0; |
|
|
1788 | else |
|
|
1789 | { |
|
|
1790 | smoothlevel = ob->smoothlevel; |
|
|
1791 | if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
|
|
1792 | SendSmooth (ns, ob->face->number); |
|
|
1793 | } /* else not already head object or blank face */ |
|
|
1794 | |
|
|
1795 | /* We've gotten what face we want to use for the object. Now see if |
|
|
1796 | * if it has changed since we last sent it to the client. |
|
|
1797 | */ |
|
|
1798 | if (smoothlevel > 255) |
|
|
1799 | smoothlevel = 255; |
|
|
1800 | else if (smoothlevel < 0) |
|
|
1801 | smoothlevel = 0; |
|
|
1802 | if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel) |
|
|
1803 | { |
|
|
1804 | ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel; |
|
|
1805 | SockList_AddChar (sl, (uint8) (smoothlevel & 0xFF)); |
|
|
1806 | return 1; |
|
|
1807 | } |
|
|
1808 | /* Nothing changed */ |
965 | /* Nothing changed */ |
1809 | return 0; |
966 | return 0; |
1810 | } |
967 | } |
1811 | |
968 | |
1812 | /** |
969 | /** |
1813 | * Returns the size of a data for a map square as returned by |
970 | * Returns the size of a data for a map square as returned by |
1814 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
971 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
1815 | * available. |
972 | * available. |
1816 | */ |
973 | */ |
1817 | int |
974 | int |
1818 | getExtendedMapInfoSize (NewSocket * ns) |
975 | getExtendedMapInfoSize (client * ns) |
1819 | { |
976 | { |
1820 | int result = 0; |
977 | int result = 0; |
1821 | |
978 | |
1822 | if (ns->ext_mapinfos) |
979 | if (ns->ext_mapinfos) |
1823 | { |
980 | { |
1824 | if (ns->EMI_smooth) |
981 | if (ns->EMI_smooth) |
1825 | result += 1; /*One byte for smoothlevel */ |
982 | result += 1; /*One byte for smoothlevel */ |
1826 | } |
983 | } |
|
|
984 | |
1827 | return result; |
985 | return result; |
|
|
986 | } |
|
|
987 | |
|
|
988 | // prefetch (and touch) all maps within a specific distancd |
|
|
989 | static void |
|
|
990 | prefetch_surrounding_maps (maptile *map, int distance) |
|
|
991 | { |
|
|
992 | map->last_access = runtime; |
|
|
993 | |
|
|
994 | if (--distance) |
|
|
995 | for (int dir = 4; --dir; ) |
|
|
996 | if (const shstr &path = map->tile_path [dir]) |
|
|
997 | if (maptile *&neigh = map->tile_map [dir]) |
|
|
998 | prefetch_surrounding_maps (neigh, distance); |
|
|
999 | else |
|
|
1000 | neigh = maptile::find_async (path, map); |
|
|
1001 | } |
|
|
1002 | |
|
|
1003 | // prefetch a generous area around the player |
|
|
1004 | static void |
|
|
1005 | prefetch_surrounding_maps (object *op) |
|
|
1006 | { |
|
|
1007 | prefetch_surrounding_maps (op->map, 3); |
1828 | } |
1008 | } |
1829 | |
1009 | |
1830 | /** |
1010 | /** |
1831 | * This function uses the new map1 protocol command to send the map |
1011 | * This function uses the new map1 protocol command to send the map |
1832 | * to the client. It is necessary because the old map command supports |
1012 | * to the client. It is necessary because the old map command supports |
… | |
… | |
1838 | * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off |
1018 | * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off |
1839 | * maps no sense. Instead, we actually really only use 12 bits for coordinates, |
1019 | * maps no sense. Instead, we actually really only use 12 bits for coordinates, |
1840 | * and use the other 4 bits for other informatiion. For full documentation |
1020 | * and use the other 4 bits for other informatiion. For full documentation |
1841 | * of what we send, see the doc/Protocol file. |
1021 | * of what we send, see the doc/Protocol file. |
1842 | * I will describe internally what we do: |
1022 | * I will describe internally what we do: |
1843 | * the socket->lastmap shows how the map last looked when sent to the client. |
1023 | * the ns->lastmap shows how the map last looked when sent to the client. |
1844 | * in the lastmap structure, there is a cells array, which is set to the |
1024 | * in the lastmap structure, there is a cells array, which is set to the |
1845 | * maximum viewable size (As set in config.h). |
1025 | * maximum viewable size (As set in config.h). |
1846 | * in the cells, there are faces and a count value. |
1026 | * in the cells, there are faces and a count value. |
1847 | * we use the count value to hold the darkness value. If -1, then this space |
1027 | * we use the count value to hold the darkness value. If -1, then this space |
1848 | * is not viewable. |
1028 | * is not viewable. |
… | |
… | |
1850 | * look like. |
1030 | * look like. |
1851 | */ |
1031 | */ |
1852 | void |
1032 | void |
1853 | draw_client_map1 (object *pl) |
1033 | draw_client_map1 (object *pl) |
1854 | { |
1034 | { |
1855 | int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; |
1035 | int x, y, ax, ay, startlen, max_x, max_y, oldlen; |
1856 | sint16 nx, ny; |
1036 | sint16 nx, ny; |
1857 | int estartlen, eoldlen; |
1037 | int estartlen, eoldlen; |
1858 | SockList sl; |
|
|
1859 | SockList esl; /*For extended Map info */ |
|
|
1860 | uint16 mask, emask; |
|
|
1861 | uint8 eentrysize; |
1038 | uint8 eentrysize; |
1862 | uint16 ewhatstart, ewhatflag; |
1039 | uint16 ewhatstart, ewhatflag; |
1863 | uint8 extendedinfos; |
1040 | uint8 extendedinfos; |
1864 | mapstruct *m; |
1041 | maptile *m; |
1865 | |
1042 | |
1866 | NewSocket & socket = pl->contr->socket; |
1043 | client &socket = *pl->contr->ns; |
|
|
1044 | |
|
|
1045 | if (!pl->active) |
|
|
1046 | return; |
1867 | |
1047 | |
1868 | check_map_change (pl->contr); |
1048 | check_map_change (pl->contr); |
|
|
1049 | prefetch_surrounding_maps (pl); |
1869 | |
1050 | |
1870 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
1051 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1871 | if (socket.mapmode == Map1Cmd) |
1052 | packet esl; |
1872 | strcpy ((char *) sl.buf, "map1 "); |
1053 | |
1873 | else |
|
|
1874 | strcpy ((char *) sl.buf, "map1a "); |
|
|
1875 | sl.len = strlen ((char *) sl.buf); |
|
|
1876 | startlen = sl.len; |
1054 | startlen = sl.length (); |
|
|
1055 | |
1877 | /*Extendedmapinfo structure initialisation */ |
1056 | /*Extendedmapinfo structure initialisation */ |
1878 | if (socket.ext_mapinfos) |
1057 | if (socket.ext_mapinfos) |
1879 | { |
1058 | { |
1880 | esl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
|
|
1881 | strcpy ((char *) esl.buf, "mapextended "); |
|
|
1882 | esl.len = strlen ((char *) esl.buf); |
|
|
1883 | extendedinfos = EMI_NOREDRAW; |
1059 | extendedinfos = EMI_NOREDRAW; |
|
|
1060 | |
1884 | if (socket.EMI_smooth) |
1061 | if (socket.EMI_smooth) |
1885 | extendedinfos |= EMI_SMOOTH; |
1062 | extendedinfos |= EMI_SMOOTH; |
|
|
1063 | |
1886 | ewhatstart = esl.len; |
1064 | ewhatstart = esl.length (); |
1887 | ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit |
1065 | ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit |
1888 | could need to be taken away */ |
1066 | could need to be taken away */ |
1889 | SockList_AddChar (&esl, extendedinfos); |
|
|
1890 | eentrysize = getExtendedMapInfoSize (&socket); |
1067 | eentrysize = getExtendedMapInfoSize (&socket); |
1891 | SockList_AddChar (&esl, eentrysize); |
1068 | esl << "mapextended " |
|
|
1069 | << uint8 (extendedinfos) |
|
|
1070 | << uint8 (eentrysize); |
|
|
1071 | |
1892 | estartlen = esl.len; |
1072 | estartlen = esl.length (); |
1893 | } |
|
|
1894 | else |
|
|
1895 | { |
1073 | } |
1896 | /* suppress compiler warnings */ |
|
|
1897 | ewhatstart = 0; |
|
|
1898 | ewhatflag = 0; |
|
|
1899 | estartlen = 0; |
|
|
1900 | } |
|
|
1901 | /* Init data to zero */ |
|
|
1902 | memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS); |
|
|
1903 | |
1074 | |
1904 | /* x,y are the real map locations. ax, ay are viewport relative |
1075 | /* x,y are the real map locations. ax, ay are viewport relative |
1905 | * locations. |
1076 | * locations. |
1906 | */ |
1077 | */ |
1907 | ay = 0; |
1078 | ay = 0; |
… | |
… | |
1909 | /* We could do this logic as conditionals in the if statement, |
1080 | /* We could do this logic as conditionals in the if statement, |
1910 | * but that started to get a bit messy to look at. |
1081 | * but that started to get a bit messy to look at. |
1911 | */ |
1082 | */ |
1912 | max_x = pl->x + (socket.mapx + 1) / 2; |
1083 | max_x = pl->x + (socket.mapx + 1) / 2; |
1913 | max_y = pl->y + (socket.mapy + 1) / 2; |
1084 | max_y = pl->y + (socket.mapy + 1) / 2; |
1914 | if (socket.mapmode == Map1aCmd) |
1085 | |
1915 | { |
1086 | maptile *plmap = pl->map; |
1916 | max_x += MAX_HEAD_OFFSET; |
|
|
1917 | max_y += MAX_HEAD_OFFSET; |
|
|
1918 | } |
|
|
1919 | |
1087 | |
1920 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1088 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1921 | { |
1089 | { |
1922 | ax = 0; |
1090 | ax = 0; |
1923 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1091 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1924 | { |
1092 | { |
1925 | |
1093 | int emask, mask; |
1926 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1094 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1927 | |
1095 | |
1928 | /* If this space is out of the normal viewable area, we only check |
|
|
1929 | * the heads value ax or ay will only be greater than what |
|
|
1930 | * the client wants if using the map1a command - this is because |
|
|
1931 | * if the map1a command is not used, max_x and max_y will be |
|
|
1932 | * set to lower values. |
|
|
1933 | */ |
|
|
1934 | if (ax >= socket.mapx || ay >= socket.mapy) |
|
|
1935 | { |
|
|
1936 | int i, got_one; |
|
|
1937 | |
|
|
1938 | oldlen = sl.len; |
|
|
1939 | |
|
|
1940 | SockList_AddShort (&sl, mask); |
|
|
1941 | |
|
|
1942 | if (check_head (sl, socket, ax, ay, 2)) |
|
|
1943 | mask |= 0x4; |
|
|
1944 | if (check_head (sl, socket, ax, ay, 1)) |
|
|
1945 | mask |= 0x2; |
|
|
1946 | if (check_head (sl, socket, ax, ay, 0)) |
|
|
1947 | mask |= 0x1; |
|
|
1948 | |
|
|
1949 | /* If all we are doing is sending 0 (blank) faces, we don't |
|
|
1950 | * actually need to send that - just the coordinates |
|
|
1951 | * with no faces tells the client to blank out the |
|
|
1952 | * space. |
|
|
1953 | */ |
|
|
1954 | got_one = 0; |
|
|
1955 | for (i = oldlen + 2; i < sl.len; i++) |
|
|
1956 | { |
|
|
1957 | if (sl.buf[i]) |
|
|
1958 | got_one = 1; |
|
|
1959 | } |
|
|
1960 | |
|
|
1961 | if (got_one && (mask & 0xf)) |
|
|
1962 | { |
|
|
1963 | sl.buf[oldlen + 1] = mask & 0xff; |
|
|
1964 | } |
|
|
1965 | else |
|
|
1966 | { /*either all faces blank, either no face at all */ |
|
|
1967 | if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ |
|
|
1968 | sl.len = oldlen + 2; |
|
|
1969 | else |
|
|
1970 | sl.len = oldlen; |
|
|
1971 | } |
|
|
1972 | /*What concerns extendinfos, nothing to be done for now |
|
|
1973 | * (perhaps effects layer later) |
|
|
1974 | */ |
|
|
1975 | continue; /* don't do processing below */ |
|
|
1976 | } |
|
|
1977 | |
|
|
1978 | MapCell & lastcell = socket.lastmap.cells[ax][ay]; |
1096 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1979 | |
|
|
1980 | d = pl->contr->blocked_los[ax][ay]; |
|
|
1981 | |
1097 | |
1982 | /* If the coordinates are not valid, or it is too dark to see, |
1098 | /* If the coordinates are not valid, or it is too dark to see, |
1983 | * we tell the client as such |
1099 | * we tell the client as such |
1984 | */ |
1100 | */ |
1985 | nx = x; |
1101 | nx = x; |
1986 | ny = y; |
1102 | ny = y; |
1987 | m = get_map_from_coord (pl->map, &nx, &ny); |
1103 | m = get_map_from_coord (plmap, &nx, &ny); |
|
|
1104 | |
1988 | if (!m) |
1105 | if (!m) |
1989 | { |
1106 | { |
1990 | /* space is out of map. Update space and clear values |
1107 | /* space is out of map. Update space and clear values |
1991 | * if this hasn't already been done. If the space is out |
1108 | * if this hasn't already been done. If the space is out |
1992 | * of the map, it shouldn't have a head |
1109 | * of the map, it shouldn't have a head |
1993 | */ |
1110 | */ |
1994 | if (lastcell.count != -1) |
1111 | if (lastcell.count != -1) |
1995 | { |
1112 | { |
1996 | SockList_AddShort (&sl, mask); |
1113 | sl << uint16 (mask); |
1997 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1114 | map_clearcell (&lastcell, -1); |
1998 | } |
1115 | } |
|
|
1116 | |
|
|
1117 | continue; |
1999 | } |
1118 | } |
|
|
1119 | |
|
|
1120 | m->touch (); |
|
|
1121 | |
|
|
1122 | int d = pl->contr->blocked_los[ax][ay]; |
|
|
1123 | |
2000 | else if (d > 3) |
1124 | if (d > 3) |
2001 | { |
1125 | { |
|
|
1126 | |
2002 | int need_send = 0, count; |
1127 | int need_send = 0, count; |
2003 | |
1128 | |
2004 | /* This block deals with spaces that are not visible for whatever |
1129 | /* This block deals with spaces that are not visible for whatever |
2005 | * reason. Still may need to send the head for this space. |
1130 | * reason. Still may need to send the head for this space. |
2006 | */ |
1131 | */ |
2007 | |
1132 | |
2008 | oldlen = sl.len; |
1133 | oldlen = sl.length (); |
2009 | |
1134 | |
2010 | SockList_AddShort (&sl, mask); |
1135 | sl << uint16 (mask); |
|
|
1136 | |
2011 | if (lastcell.count != -1) |
1137 | if (lastcell.count != -1) |
2012 | need_send = 1; |
1138 | need_send = 1; |
|
|
1139 | |
2013 | count = -1; |
1140 | count = -1; |
2014 | |
1141 | |
2015 | if (socket.mapmode == Map1aCmd && have_head (ax, ay)) |
1142 | /* properly clear a previously sent big face */ |
2016 | { |
1143 | if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] |
2017 | /* Now check to see if any heads need to be sent */ |
1144 | || lastcell.stat_hp || lastcell.flags || lastcell.player) |
|
|
1145 | need_send = 1; |
2018 | |
1146 | |
2019 | if (check_head (sl, socket, ax, ay, 2)) |
1147 | map_clearcell (&lastcell, count); |
2020 | mask |= 0x4; |
|
|
2021 | if (check_head (sl, socket, ax, ay, 1)) |
|
|
2022 | mask |= 0x2; |
|
|
2023 | if (check_head (sl, socket, ax, ay, 0)) |
|
|
2024 | mask |= 0x1; |
|
|
2025 | |
1148 | |
2026 | lastcell.count = count; |
1149 | if ((mask & 0xf) || need_send) |
2027 | |
1150 | sl[oldlen + 1] = mask & 0xff; |
2028 | } |
|
|
2029 | else |
1151 | else |
2030 | { |
|
|
2031 | struct MapCell *cell = &lastcell; |
|
|
2032 | |
|
|
2033 | /* properly clear a previously sent big face */ |
|
|
2034 | if (cell->faces[0] != 0 || cell->faces[1] != 0 || cell->faces[2] != 0) |
|
|
2035 | need_send = 1; |
|
|
2036 | map_clearcell (&lastcell, 0, 0, 0, count); |
|
|
2037 | } |
|
|
2038 | |
|
|
2039 | if ((mask & 0xf) || need_send) |
|
|
2040 | { |
|
|
2041 | sl.buf[oldlen + 1] = mask & 0xff; |
|
|
2042 | } |
|
|
2043 | else |
|
|
2044 | { |
|
|
2045 | sl.len = oldlen; |
1152 | sl.reset (oldlen); |
2046 | } |
|
|
2047 | } |
1153 | } |
2048 | else |
1154 | else |
2049 | { |
1155 | { |
2050 | /* In this block, the space is visible or there are head objects |
1156 | /* In this block, the space is visible. |
2051 | * we need to send. |
|
|
2052 | */ |
1157 | */ |
2053 | |
1158 | |
2054 | /* Rather than try to figure out what everything that we might |
1159 | /* Rather than try to figure out what everything that we might |
2055 | * need to send is, then form the packet after that, |
1160 | * need to send is, then form the packet after that, |
2056 | * we presume that we will in fact form a packet, and update |
1161 | * we presume that we will in fact form a packet, and update |
2057 | * the bits by what we do actually send. If we send nothing, |
1162 | * the bits by what we do actually send. If we send nothing, |
2058 | * we just back out sl.len to the old value, and no harm |
1163 | * we just back out sl.length () to the old value, and no harm |
2059 | * is done. |
1164 | * is done. |
2060 | * I think this is simpler than doing a bunch of checks to see |
1165 | * I think this is simpler than doing a bunch of checks to see |
2061 | * what if anything we need to send, setting the bits, then |
1166 | * what if anything we need to send, setting the bits, then |
2062 | * doing those checks again to add the real data. |
1167 | * doing those checks again to add the real data. |
2063 | */ |
1168 | */ |
2064 | oldlen = sl.len; |
1169 | oldlen = sl.length (); |
2065 | mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
|
|
2066 | eoldlen = esl.len; |
1170 | eoldlen = esl.length (); |
2067 | emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
|
|
2068 | SockList_AddShort (&sl, mask); |
|
|
2069 | |
1171 | |
2070 | if (socket.ext_mapinfos) |
1172 | sl << uint16 (mask); |
2071 | SockList_AddShort (&esl, emask); |
|
|
2072 | |
1173 | |
2073 | unsigned char dummy; |
1174 | unsigned char dummy; |
2074 | unsigned char *last_ext = &dummy; |
1175 | unsigned char *last_ext = &dummy; |
2075 | |
1176 | |
2076 | /* Darkness changed */ |
1177 | /* Darkness changed */ |
… | |
… | |
2079 | mask |= 0x8; |
1180 | mask |= 0x8; |
2080 | |
1181 | |
2081 | if (socket.extmap) |
1182 | if (socket.extmap) |
2082 | { |
1183 | { |
2083 | *last_ext |= 0x80; |
1184 | *last_ext |= 0x80; |
2084 | last_ext = sl.buf + sl.len; |
1185 | last_ext = &sl[sl.length ()]; |
2085 | SockList_AddChar (&sl, d); |
1186 | sl << uint8 (d); |
2086 | } |
1187 | } |
2087 | else |
1188 | else |
2088 | SockList_AddChar (&sl, 255 - 64 * d); |
1189 | sl << uint8 (255 - 64 * d); |
2089 | } |
1190 | } |
2090 | |
1191 | |
2091 | lastcell.count = d; |
1192 | lastcell.count = d; |
|
|
1193 | |
|
|
1194 | mapspace &ms = m->at (nx, ny); |
2092 | |
1195 | |
2093 | if (socket.extmap) |
1196 | if (socket.extmap) |
2094 | { |
1197 | { |
2095 | uint8 stat_hp = 0; |
1198 | uint8 stat_hp = 0; |
2096 | uint8 stat_width = 0; |
1199 | uint8 stat_width = 0; |
|
|
1200 | uint8 flags = 0; |
2097 | tag_t player = 0; |
1201 | tag_t player = 0; |
2098 | |
1202 | |
2099 | // send hp information, if applicable |
1203 | // send hp information, if applicable |
2100 | if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) |
1204 | if (object *op = ms.faces_obj [0]) |
2101 | { |
1205 | { |
2102 | if (op->head || op->invisible) |
1206 | if (op->head || op->invisible) |
2103 | ; // do not show |
1207 | ; // do not show |
2104 | else if (op->type == PLAYER |
1208 | else if (op->type == PLAYER |
2105 | || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) |
1209 | || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) |
… | |
… | |
2109 | stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; |
1213 | stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; |
2110 | stat_width = op->arch->tail_x; |
1214 | stat_width = op->arch->tail_x; |
2111 | } |
1215 | } |
2112 | } |
1216 | } |
2113 | |
1217 | |
|
|
1218 | if (op->msg && op->msg[0] == '@') |
|
|
1219 | flags |= 1; |
|
|
1220 | |
2114 | if (op->type == PLAYER && op != pl) |
1221 | if (op->type == PLAYER && op != pl) |
2115 | player = op->count; |
1222 | player = op->count; |
2116 | } |
1223 | } |
2117 | |
1224 | |
2118 | if (lastcell.stat_hp != stat_hp) |
1225 | if (lastcell.stat_hp != stat_hp) |
2119 | { |
1226 | { |
2120 | lastcell.stat_hp = stat_hp; |
1227 | lastcell.stat_hp = stat_hp; |
2121 | |
1228 | |
2122 | mask |= 0x8; |
1229 | mask |= 0x8; |
2123 | *last_ext |= 0x80; |
1230 | *last_ext |= 0x80; |
2124 | last_ext = sl.buf + sl.len; |
1231 | last_ext = &sl[sl.length ()]; |
2125 | SockList_AddChar (&sl, 5); |
1232 | |
2126 | SockList_AddChar (&sl, stat_hp); |
1233 | sl << uint8 (5) << uint8 (stat_hp); |
2127 | |
1234 | |
2128 | if (stat_width > 1) |
1235 | if (stat_width > 1) |
2129 | { |
1236 | { |
2130 | *last_ext |= 0x80; |
1237 | *last_ext |= 0x80; |
2131 | last_ext = sl.buf + sl.len; |
1238 | last_ext = &sl[sl.length ()]; |
2132 | SockList_AddChar (&sl, 6); |
1239 | |
2133 | SockList_AddChar (&sl, stat_width); |
1240 | sl << uint8 (6) << uint8 (stat_width); |
2134 | } |
1241 | } |
2135 | } |
1242 | } |
2136 | |
1243 | |
2137 | if (lastcell.player !=player) |
1244 | if (lastcell.player != player) |
2138 | { |
1245 | { |
2139 | lastcell.player = player; |
1246 | lastcell.player = player; |
2140 | |
1247 | |
2141 | mask |= 0x8; |
1248 | mask |= 0x8; |
2142 | *last_ext |= 0x80; |
1249 | *last_ext |= 0x80; |
2143 | last_ext = sl.buf + sl.len; |
1250 | last_ext = &sl[sl.length ()]; |
2144 | SockList_AddChar (&sl, 0x47); |
1251 | |
2145 | SockList_AddChar (&sl, 4); |
1252 | sl << uint8 (0x47) << uint8 (4) << (uint32)player; |
2146 | SockList_AddInt (&sl, player); |
1253 | } |
|
|
1254 | |
|
|
1255 | if (lastcell.flags != flags) |
|
|
1256 | { |
|
|
1257 | lastcell.flags = flags; |
|
|
1258 | |
|
|
1259 | mask |= 0x8; |
|
|
1260 | *last_ext |= 0x80; |
|
|
1261 | last_ext = &sl[sl.length ()]; |
|
|
1262 | |
|
|
1263 | sl << uint8 (8) << uint8 (flags); |
2147 | } |
1264 | } |
2148 | } |
1265 | } |
2149 | |
1266 | |
2150 | /* Floor face */ |
1267 | /* Floor face */ |
2151 | if (update_space (&sl, &socket, m, nx, ny, ax, ay, 2)) |
1268 | if (update_space (sl, socket, ms, lastcell, 2)) |
2152 | mask |= 0x4; |
1269 | mask |= 0x4; |
2153 | |
1270 | |
2154 | if (socket.EMI_smooth) |
|
|
2155 | if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 2)) |
|
|
2156 | emask |= 0x4; |
|
|
2157 | |
|
|
2158 | /* Middle face */ |
1271 | /* Middle face */ |
2159 | if (update_space (&sl, &socket, m, nx, ny, ax, ay, 1)) |
1272 | if (update_space (sl, socket, ms, lastcell, 1)) |
2160 | mask |= 0x2; |
1273 | mask |= 0x2; |
2161 | |
1274 | |
2162 | if (socket.EMI_smooth) |
1275 | if (ms.player () == pl |
2163 | if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 1)) |
1276 | && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) |
2164 | emask |= 0x2; |
|
|
2165 | |
|
|
2166 | if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) |
|
|
2167 | { |
1277 | { |
|
|
1278 | // force player to be visible to himself if invisible |
2168 | if (lastcell.faces[0] != pl->face->number) |
1279 | if (lastcell.faces[0] != pl->face) |
2169 | { |
1280 | { |
2170 | lastcell.faces[0] = pl->face->number; |
1281 | lastcell.faces[0] = pl->face; |
|
|
1282 | |
2171 | mask |= 0x1; |
1283 | mask |= 0x1; |
2172 | if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) |
1284 | sl << uint16 (pl->face); |
2173 | esrv_send_face (&socket, pl->face->number, 0); |
1285 | |
2174 | SockList_AddShort (&sl, pl->face->number); |
1286 | socket.send_faces (pl); |
2175 | } |
1287 | } |
2176 | } |
1288 | } |
2177 | /* Top face */ |
1289 | /* Top face */ |
2178 | else |
|
|
2179 | { |
|
|
2180 | if (update_space (&sl, &socket, m, nx, ny, ax, ay, 0)) |
1290 | else if (update_space (sl, socket, ms, lastcell, 0)) |
2181 | mask |= 0x1; |
1291 | mask |= 0x1; |
2182 | if (socket.EMI_smooth) |
|
|
2183 | if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 0)) |
|
|
2184 | { |
|
|
2185 | emask |= 0x1; |
|
|
2186 | } |
|
|
2187 | } |
1292 | |
|
|
1293 | |
2188 | /* Check to see if we are in fact sending anything for this |
1294 | /* Check to see if we are in fact sending anything for this |
2189 | * space by checking the mask. If so, update the mask. |
1295 | * space by checking the mask. If so, update the mask. |
2190 | * if not, reset the len to that from before adding the mask |
1296 | * if not, reset the len to that from before adding the mask |
2191 | * value, so we don't send those bits. |
1297 | * value, so we don't send those bits. |
2192 | */ |
1298 | */ |
2193 | if (mask & 0xf) |
1299 | if (mask & 0xf) |
|
|
1300 | sl[oldlen + 1] = mask & 0xff; |
|
|
1301 | else |
|
|
1302 | sl.reset (oldlen); |
|
|
1303 | |
|
|
1304 | if (socket.ext_mapinfos) |
|
|
1305 | esl << uint16 (emask); |
|
|
1306 | |
|
|
1307 | if (socket.EMI_smooth) |
2194 | { |
1308 | { |
2195 | sl.buf[oldlen + 1] = mask & 0xff; |
1309 | for (int layer = 2+1; layer--; ) |
2196 | } |
|
|
2197 | else |
|
|
2198 | { |
1310 | { |
2199 | sl.len = oldlen; |
1311 | object *ob = ms.faces_obj [layer]; |
|
|
1312 | |
|
|
1313 | // If there is no object for this space, or if the face for the object |
|
|
1314 | // is the blank face, set the smoothlevel to zero. |
|
|
1315 | int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0; |
|
|
1316 | |
|
|
1317 | // We've gotten what face we want to use for the object. Now see if |
|
|
1318 | // if it has changed since we last sent it to the client. |
|
|
1319 | if (lastcell.smooth[layer] != smoothlevel) |
|
|
1320 | { |
|
|
1321 | lastcell.smooth[layer] = smoothlevel; |
|
|
1322 | esl << uint8 (smoothlevel); |
|
|
1323 | emask |= 1 << layer; |
|
|
1324 | } |
2200 | } |
1325 | } |
|
|
1326 | |
2201 | if (emask & 0xf) |
1327 | if (emask & 0xf) |
2202 | { |
|
|
2203 | esl.buf[eoldlen + 1] = emask & 0xff; |
1328 | esl[eoldlen + 1] = emask & 0xff; |
2204 | } |
|
|
2205 | else |
1329 | else |
2206 | { |
|
|
2207 | esl.len = eoldlen; |
1330 | esl.reset (eoldlen); |
2208 | } |
1331 | } |
2209 | } /* else this is a viewable space */ |
1332 | } /* else this is a viewable space */ |
2210 | } /* for x loop */ |
1333 | } /* for x loop */ |
2211 | } /* for y loop */ |
1334 | } /* for y loop */ |
2212 | |
1335 | |
|
|
1336 | socket.flush_fx (); |
|
|
1337 | |
2213 | /* Verify that we in fact do need to send this */ |
1338 | /* Verify that we in fact do need to send this */ |
2214 | if (socket.ext_mapinfos) |
1339 | if (socket.ext_mapinfos) |
2215 | { |
1340 | { |
2216 | if (!(sl.len > startlen || socket.sent_scroll)) |
1341 | if (!(sl.length () > startlen || socket.sent_scroll)) |
2217 | { |
1342 | { |
2218 | /* No map data will follow, so don't say the client |
1343 | /* No map data will follow, so don't say the client |
2219 | * it doesn't need draw! |
1344 | * it doesn't need draw! |
2220 | */ |
1345 | */ |
2221 | ewhatflag &= (~EMI_NOREDRAW); |
1346 | ewhatflag &= ~EMI_NOREDRAW; |
2222 | esl.buf[ewhatstart + 1] = ewhatflag & 0xff; |
1347 | esl[ewhatstart + 1] = ewhatflag & 0xff; |
2223 | } |
1348 | } |
2224 | |
1349 | |
2225 | if (esl.len > estartlen) |
1350 | if (esl.length () > estartlen) |
2226 | Send_With_Handling (&socket, &esl); |
1351 | socket.send_packet (esl); |
2227 | |
|
|
2228 | free (esl.buf); |
|
|
2229 | } |
1352 | } |
2230 | |
1353 | |
2231 | if (sl.len > startlen || socket.sent_scroll) |
1354 | if (sl.length () > startlen || socket.sent_scroll) |
2232 | { |
1355 | { |
2233 | Send_With_Handling (&socket, &sl); |
1356 | socket.send_packet (sl); |
2234 | socket.sent_scroll = 0; |
1357 | socket.sent_scroll = 0; |
2235 | } |
1358 | } |
2236 | |
|
|
2237 | free (sl.buf); |
|
|
2238 | } |
1359 | } |
2239 | |
1360 | |
2240 | /** |
1361 | /** |
2241 | * Draws client map. |
1362 | * Draws client map. |
2242 | */ |
1363 | */ |
2243 | void |
1364 | void |
2244 | draw_client_map (object *pl) |
1365 | draw_client_map (object *pl) |
2245 | { |
1366 | { |
2246 | int i, j; |
1367 | int i, j; |
2247 | sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ |
1368 | sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */ |
2248 | New_Face *face, *floor; |
|
|
2249 | New_Face *floor2; |
|
|
2250 | int d, mflags; |
1369 | int mflags; |
2251 | struct Map newmap; |
1370 | struct Map newmap; |
2252 | mapstruct *m, *pm; |
1371 | maptile *m, *pm; |
2253 | |
1372 | |
2254 | if (pl->type != PLAYER) |
1373 | if (pl->type != PLAYER) |
2255 | { |
1374 | { |
2256 | LOG (llevError, "draw_client_map called with non player/non eric-server\n"); |
1375 | LOG (llevError, "draw_client_map called with non player/non eric-server\n"); |
2257 | return; |
1376 | return; |
… | |
… | |
2266 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
1385 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2267 | return; |
1386 | return; |
2268 | |
1387 | |
2269 | memset (&newmap, 0, sizeof (struct Map)); |
1388 | memset (&newmap, 0, sizeof (struct Map)); |
2270 | |
1389 | |
2271 | for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) |
1390 | for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) |
2272 | { |
|
|
2273 | for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) |
1391 | for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) |
2274 | { |
1392 | { |
2275 | ax = i; |
1393 | ax = i; |
2276 | ay = j; |
1394 | ay = j; |
2277 | m = pm; |
1395 | m = pm; |
2278 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
1396 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
|
|
1397 | |
2279 | if (mflags & P_OUT_OF_MAP) |
1398 | if (mflags & P_OUT_OF_MAP) |
2280 | continue; |
1399 | continue; |
2281 | if (mflags & P_NEED_UPDATE) |
1400 | |
2282 | update_position (m, ax, ay); |
|
|
2283 | /* If a map is visible to the player, we don't want to swap it out |
1401 | /* If a map is visible to the player, we don't want to swap it out |
2284 | * just to reload it. This should really call something like |
1402 | * just to reload it. This should really call something like |
2285 | * swap_map, but this is much more efficient and 'good enough' |
1403 | * swap_map, but this is much more efficient and 'good enough' |
2286 | */ |
1404 | */ |
2287 | if (mflags & P_NEW_MAP) |
1405 | if (mflags & P_NEW_MAP) |
2288 | m->timeout = 50; |
1406 | m->timeout = 50; |
2289 | } |
1407 | } |
2290 | } |
1408 | |
2291 | /* do LOS after calls to update_position */ |
1409 | /* do LOS after calls to update_position */ |
2292 | if (pl->contr->do_los) |
1410 | if (pl->contr->do_los) |
2293 | { |
1411 | { |
2294 | update_los (pl); |
1412 | update_los (pl); |
2295 | pl->contr->do_los = 0; |
1413 | pl->contr->do_los = 0; |
2296 | } |
1414 | } |
2297 | |
1415 | |
2298 | if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd) |
|
|
2299 | { |
|
|
2300 | /* Big maps need a different drawing mechanism to work */ |
1416 | /* Big maps need a different drawing mechanism to work */ |
2301 | draw_client_map1 (pl); |
1417 | draw_client_map1 (pl); |
2302 | return; |
|
|
2303 | } |
|
|
2304 | |
|
|
2305 | if (pl->invisible & (pl->invisible < 50 ? 4 : 1)) |
|
|
2306 | { |
|
|
2307 | esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap); |
|
|
2308 | } |
|
|
2309 | |
|
|
2310 | /* j and i are the y and x coordinates of the real map (which is |
|
|
2311 | * basically some number of spaces around the player) |
|
|
2312 | * ax and ay are values from within the viewport (ie, 0, 0 is upper |
|
|
2313 | * left corner) and are thus disconnected from the map values. |
|
|
2314 | * Subtract 1 from the max values so that we properly handle cases where |
|
|
2315 | * player has specified an even map. Otherwise, we try to send them too |
|
|
2316 | * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually |
|
|
2317 | * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is |
|
|
2318 | * odd, this still works fine. |
|
|
2319 | */ |
|
|
2320 | ay = 0; |
|
|
2321 | for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++) |
|
|
2322 | { |
|
|
2323 | ax = 0; |
|
|
2324 | for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++) |
|
|
2325 | { |
|
|
2326 | |
|
|
2327 | d = pl->contr->blocked_los[ax][ay]; |
|
|
2328 | /* note the out_of_map and d>3 checks are both within the same |
|
|
2329 | * negation check. |
|
|
2330 | */ |
|
|
2331 | nx = i; |
|
|
2332 | ny = j; |
|
|
2333 | m = get_map_from_coord (pm, &nx, &ny); |
|
|
2334 | if (m && d < 4) |
|
|
2335 | { |
|
|
2336 | face = GET_MAP_FACE (m, nx, ny, 0); |
|
|
2337 | floor2 = GET_MAP_FACE (m, nx, ny, 1); |
|
|
2338 | floor = GET_MAP_FACE (m, nx, ny, 2); |
|
|
2339 | |
|
|
2340 | /* If all is blank, send a blank face. */ |
|
|
2341 | if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face)) |
|
|
2342 | { |
|
|
2343 | esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap); |
|
|
2344 | } |
|
|
2345 | else |
|
|
2346 | { /* actually have something interesting */ |
|
|
2347 | /* send the darkness mask, if any. */ |
|
|
2348 | if (d && pl->contr->socket.darkness) |
|
|
2349 | esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap); |
|
|
2350 | |
|
|
2351 | if (face && face != blank_face) |
|
|
2352 | esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap); |
|
|
2353 | if (floor2 && floor2 != blank_face) |
|
|
2354 | esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap); |
|
|
2355 | if (floor && floor != blank_face) |
|
|
2356 | esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap); |
|
|
2357 | } |
|
|
2358 | } /* Is a valid space */ |
|
|
2359 | } |
|
|
2360 | } |
|
|
2361 | esrv_map_doneredraw (&pl->contr->socket, &newmap); |
|
|
2362 | |
|
|
2363 | check_map_change (pl->contr); |
|
|
2364 | } |
1418 | } |
2365 | |
1419 | |
2366 | |
1420 | |
2367 | /*****************************************************************************/ |
1421 | /*****************************************************************************/ |
2368 | |
1422 | |
… | |
… | |
2374 | |
1428 | |
2375 | /*****************************************************************************/ |
1429 | /*****************************************************************************/ |
2376 | void |
1430 | void |
2377 | send_plugin_custom_message (object *pl, char *buf) |
1431 | send_plugin_custom_message (object *pl, char *buf) |
2378 | { |
1432 | { |
2379 | cs_write_string (&pl->contr->socket, buf, strlen (buf)); |
1433 | pl->contr->ns->send_packet (buf); |
2380 | } |
1434 | } |
2381 | |
1435 | |
2382 | /** |
1436 | /** |
2383 | * This sends the skill number to name mapping. We ignore |
1437 | * This sends the skill number to name mapping. We ignore |
2384 | * the params - we always send the same info no matter what. |
1438 | * the params - we always send the same info no matter what. |
2385 | */ |
1439 | */ |
2386 | void |
1440 | void |
2387 | send_skill_info (NewSocket * ns, char *params) |
1441 | send_skill_info (client *ns, char *params) |
2388 | { |
1442 | { |
2389 | SockList sl; |
1443 | packet sl; |
2390 | int i; |
1444 | sl << "replyinfo skill_info\n"; |
2391 | |
1445 | |
2392 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
|
|
2393 | strcpy ((char *) sl.buf, "replyinfo skill_info\n"); |
|
|
2394 | for (i = 1; i < NUM_SKILLS; i++) |
1446 | for (int i = 1; i < NUM_SKILLS; i++) |
2395 | { |
1447 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
2396 | sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
1448 | |
2397 | } |
|
|
2398 | sl.len = strlen ((char *) sl.buf); |
|
|
2399 | if (sl.len >= MAXSOCKBUF) |
1449 | if (sl.length () >= MAXSOCKBUF) |
2400 | { |
1450 | { |
2401 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
1451 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
2402 | fatal (0); |
1452 | fatal (0); |
2403 | } |
1453 | } |
2404 | Send_With_Handling (ns, &sl); |
1454 | |
2405 | free (sl.buf); |
1455 | ns->send_packet (sl); |
2406 | } |
1456 | } |
2407 | |
1457 | |
2408 | /** |
1458 | /** |
2409 | * This sends the spell path to name mapping. We ignore |
1459 | * This sends the spell path to name mapping. We ignore |
2410 | * the params - we always send the same info no matter what. |
1460 | * the params - we always send the same info no matter what. |
2411 | */ |
1461 | */ |
2412 | void |
1462 | void |
2413 | send_spell_paths (NewSocket * ns, char *params) |
1463 | send_spell_paths (client * ns, char *params) |
2414 | { |
1464 | { |
2415 | SockList sl; |
1465 | packet sl; |
2416 | int i; |
|
|
2417 | |
1466 | |
2418 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
1467 | sl << "replyinfo spell_paths\n"; |
2419 | strcpy ((char *) sl.buf, "replyinfo spell_paths\n"); |
1468 | |
2420 | for (i = 0; i < NRSPELLPATHS; i++) |
1469 | for (int i = 0; i < NRSPELLPATHS; i++) |
2421 | sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", 1 << i, spellpathnames[i]); |
1470 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
2422 | sl.len = strlen ((char *) sl.buf); |
1471 | |
2423 | if (sl.len >= MAXSOCKBUF) |
1472 | if (sl.length () >= MAXSOCKBUF) |
2424 | { |
1473 | { |
2425 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
1474 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
2426 | fatal (0); |
1475 | fatal (0); |
2427 | } |
1476 | } |
2428 | Send_With_Handling (ns, &sl); |
1477 | |
2429 | free (sl.buf); |
1478 | ns->send_packet (sl); |
2430 | } |
1479 | } |
2431 | |
1480 | |
2432 | /** |
1481 | /** |
2433 | * This looks for any spells the player may have that have changed their stats. |
1482 | * This looks for any spells the player may have that have changed their stats. |
2434 | * it then sends an updspell packet for each spell that has changed in this way |
1483 | * it then sends an updspell packet for each spell that has changed in this way |
2435 | */ |
1484 | */ |
2436 | void |
1485 | void |
2437 | esrv_update_spells (player *pl) |
1486 | esrv_update_spells (player *pl) |
2438 | { |
1487 | { |
2439 | SockList sl; |
1488 | if (!pl->ns) |
2440 | int flags = 0; |
|
|
2441 | object *spell; |
|
|
2442 | |
|
|
2443 | if (!pl->socket.monitor_spells) |
|
|
2444 | return; |
1489 | return; |
|
|
1490 | |
|
|
1491 | if (!pl->ns->monitor_spells) |
|
|
1492 | return; |
|
|
1493 | |
2445 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
1494 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2446 | { |
1495 | { |
2447 | if (spell->type == SPELL) |
1496 | if (spell->type == SPELL) |
2448 | { |
1497 | { |
|
|
1498 | int flags = 0; |
|
|
1499 | |
2449 | /* check if we need to update it */ |
1500 | /* check if we need to update it */ |
2450 | if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) |
1501 | if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) |
2451 | { |
1502 | { |
2452 | spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
1503 | spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
2453 | flags |= UPD_SP_MANA; |
1504 | flags |= UPD_SP_MANA; |
2454 | } |
1505 | } |
|
|
1506 | |
2455 | if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) |
1507 | if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) |
2456 | { |
1508 | { |
2457 | spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
1509 | spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
2458 | flags |= UPD_SP_GRACE; |
1510 | flags |= UPD_SP_GRACE; |
2459 | } |
1511 | } |
|
|
1512 | |
2460 | if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) |
1513 | if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) |
2461 | { |
1514 | { |
2462 | spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
1515 | spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
2463 | flags |= UPD_SP_DAMAGE; |
1516 | flags |= UPD_SP_DAMAGE; |
2464 | } |
1517 | } |
|
|
1518 | |
2465 | if (flags != 0) |
1519 | if (flags) |
2466 | { |
1520 | { |
2467 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
1521 | packet sl; |
2468 | strcpy ((char *) sl.buf, "updspell "); |
1522 | |
2469 | sl.len = strlen ((char *) sl.buf); |
1523 | sl << "updspell " |
2470 | SockList_AddChar (&sl, flags); |
1524 | << uint8 (flags) |
2471 | SockList_AddInt (&sl, spell->count); |
1525 | << uint32 (spell->count); |
2472 | if (flags & UPD_SP_MANA) |
1526 | |
2473 | SockList_AddShort (&sl, spell->last_sp); |
1527 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2474 | if (flags & UPD_SP_GRACE) |
1528 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2475 | SockList_AddShort (&sl, spell->last_grace); |
1529 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2476 | if (flags & UPD_SP_DAMAGE) |
1530 | |
2477 | SockList_AddShort (&sl, spell->last_eat); |
1531 | pl->ns->send_packet (sl); |
2478 | flags = 0; |
|
|
2479 | Send_With_Handling (&pl->socket, &sl); |
|
|
2480 | free (sl.buf); |
|
|
2481 | } |
1532 | } |
2482 | } |
1533 | } |
2483 | } |
1534 | } |
2484 | } |
1535 | } |
2485 | |
1536 | |
2486 | void |
1537 | void |
2487 | esrv_remove_spell (player *pl, object *spell) |
1538 | esrv_remove_spell (player *pl, object *spell) |
2488 | { |
1539 | { |
2489 | SockList sl; |
|
|
2490 | |
|
|
2491 | if (!pl->socket.monitor_spells) |
1540 | if (!pl->ns->monitor_spells) |
2492 | return; |
1541 | return; |
|
|
1542 | |
2493 | if (!pl || !spell || spell->env != pl->ob) |
1543 | if (!pl || !spell || spell->env != pl->ob) |
2494 | { |
1544 | { |
2495 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
1545 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2496 | return; |
1546 | return; |
2497 | } |
1547 | } |
2498 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
1548 | |
2499 | strcpy ((char *) sl.buf, "delspell "); |
1549 | packet sl ("delspell"); |
2500 | sl.len = strlen ((char *) sl.buf); |
1550 | |
2501 | SockList_AddInt (&sl, spell->count); |
1551 | sl << uint32 (spell->count); |
2502 | Send_With_Handling (&pl->socket, &sl); |
1552 | |
2503 | free (sl.buf); |
1553 | pl->ns->send_packet (sl); |
2504 | } |
1554 | } |
2505 | |
1555 | |
2506 | /* appends the spell *spell to the Socklist we will send the data to. */ |
1556 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2507 | static void |
1557 | static void |
2508 | append_spell (player *pl, SockList * sl, object *spell) |
1558 | append_spell (player *pl, packet &sl, object *spell) |
2509 | { |
1559 | { |
2510 | int len, i, skill = 0; |
1560 | int i, skill = 0; |
2511 | |
1561 | |
2512 | if (!(spell->name)) |
1562 | if (!(spell->name)) |
2513 | { |
1563 | { |
2514 | LOG (llevError, "item number %d is a spell with no name.\n", spell->count); |
1564 | LOG (llevError, "item number %d is a spell with no name.\n", spell->count); |
2515 | return; |
1565 | return; |
2516 | } |
1566 | } |
2517 | SockList_AddInt (sl, spell->count); |
1567 | |
2518 | SockList_AddShort (sl, spell->level); |
|
|
2519 | SockList_AddShort (sl, spell->casting_time); |
|
|
2520 | /* store costs and damage in the object struct, to compare to later */ |
1568 | /* store costs and damage in the object struct, to compare to later */ |
2521 | spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
1569 | spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
2522 | spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
1570 | spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
2523 | spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
1571 | spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
2524 | /* send the current values */ |
|
|
2525 | SockList_AddShort (sl, spell->last_sp); |
|
|
2526 | SockList_AddShort (sl, spell->last_grace); |
|
|
2527 | SockList_AddShort (sl, spell->last_eat); |
|
|
2528 | |
1572 | |
2529 | /* figure out which skill it uses, if it uses one */ |
1573 | /* figure out which skill it uses, if it uses one */ |
2530 | if (spell->skill) |
1574 | if (spell->skill) |
2531 | { |
1575 | { |
2532 | for (i = 1; i < NUM_SKILLS; i++) |
1576 | for (i = 1; i < NUM_SKILLS; i++) |
… | |
… | |
2534 | { |
1578 | { |
2535 | skill = i + CS_STAT_SKILLINFO; |
1579 | skill = i + CS_STAT_SKILLINFO; |
2536 | break; |
1580 | break; |
2537 | } |
1581 | } |
2538 | } |
1582 | } |
2539 | SockList_AddChar (sl, skill); |
|
|
2540 | |
1583 | |
2541 | SockList_AddInt (sl, spell->path_attuned); |
1584 | // spells better have a face |
2542 | SockList_AddInt (sl, (spell->face) ? spell->face->number : 0); |
|
|
2543 | |
|
|
2544 | len = strlen (spell->name); |
|
|
2545 | SockList_AddChar (sl, (char) len); |
|
|
2546 | memcpy (sl->buf + sl->len, spell->name, len); |
|
|
2547 | sl->len += len; |
|
|
2548 | |
|
|
2549 | if (!spell->msg) |
1585 | if (!spell->face) |
2550 | { |
|
|
2551 | SockList_AddShort (sl, 0); |
|
|
2552 | } |
1586 | { |
2553 | else |
1587 | LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); |
|
|
1588 | spell->face = face_find ("burnout.x11", blank_face); |
2554 | { |
1589 | } |
2555 | len = strlen (spell->msg); |
1590 | |
2556 | SockList_AddShort (sl, len); |
1591 | /* send the current values */ |
2557 | memcpy (sl->buf + sl->len, spell->msg, len); |
1592 | sl << uint32 (spell->count) |
2558 | sl->len += len; |
1593 | << uint16 (spell->level) |
2559 | } |
1594 | << uint16 (spell->casting_time) |
|
|
1595 | << uint16 (spell->last_sp) |
|
|
1596 | << uint16 (spell->last_grace) |
|
|
1597 | << uint16 (spell->last_eat) |
|
|
1598 | << uint8 (skill) |
|
|
1599 | << uint32 (spell->path_attuned) |
|
|
1600 | << uint32 (spell->face) |
|
|
1601 | << data8 (spell->name) |
|
|
1602 | << data16 (spell->msg); |
2560 | } |
1603 | } |
2561 | |
1604 | |
2562 | /** |
1605 | /** |
2563 | * This tells the client to add the spell *ob, if *ob is NULL, then add |
1606 | * This tells the client to add the spell *ob, if *ob is NULL, then add |
2564 | * all spells in the player's inventory. |
1607 | * all spells in the player's inventory. |
2565 | */ |
1608 | */ |
2566 | void |
1609 | void |
2567 | esrv_add_spells (player *pl, object *spell) |
1610 | esrv_add_spells (player *pl, object *spell) |
2568 | { |
1611 | { |
2569 | SockList sl; |
|
|
2570 | |
|
|
2571 | if (!pl) |
1612 | if (!pl) |
2572 | { |
1613 | { |
2573 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
1614 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2574 | return; |
1615 | return; |
2575 | } |
1616 | } |
|
|
1617 | |
2576 | if (!pl->socket.monitor_spells) |
1618 | if (!pl->ns->monitor_spells) |
2577 | return; |
1619 | return; |
2578 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
1620 | |
2579 | strcpy ((char *) sl.buf, "addspell "); |
1621 | packet sl ("addspell"); |
2580 | sl.len = strlen ((char *) sl.buf); |
1622 | |
2581 | if (!spell) |
1623 | if (!spell) |
2582 | { |
1624 | { |
2583 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
1625 | for (spell = pl->ob->inv; spell; spell = spell->below) |
2584 | { |
1626 | { |
2585 | /* were we to simply keep appending data here, we could exceed |
1627 | /* were we to simply keep appending data here, we could exceed |
2586 | * MAXSOCKBUF if the player has enough spells to add, we know that |
1628 | * MAXSOCKBUF if the player has enough spells to add, we know that |
2587 | * append_spells will always append 19 data bytes, plus 4 length |
1629 | * append_spells will always append 19 data bytes, plus 4 length |
2588 | * bytes and 3 strings (because that is the spec) so we need to |
1630 | * bytes and 3 strings (because that is the spec) so we need to |
… | |
… | |
2595 | * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem |
1637 | * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem |
2596 | * like it will fix this |
1638 | * like it will fix this |
2597 | */ |
1639 | */ |
2598 | if (spell->type != SPELL) |
1640 | if (spell->type != SPELL) |
2599 | continue; |
1641 | continue; |
|
|
1642 | |
2600 | if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
1643 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2601 | { |
1644 | { |
2602 | Send_With_Handling (&pl->socket, &sl); |
1645 | pl->ns->send_packet (sl); |
2603 | strcpy ((char *) sl.buf, "addspell "); |
1646 | |
2604 | sl.len = strlen ((char *) sl.buf); |
1647 | sl.reset (); |
|
|
1648 | sl << "addspell "; |
2605 | } |
1649 | } |
|
|
1650 | |
2606 | append_spell (pl, &sl, spell); |
1651 | append_spell (pl, sl, spell); |
2607 | } |
1652 | } |
2608 | } |
1653 | } |
2609 | else if (spell->type != SPELL) |
1654 | else if (spell->type != SPELL) |
2610 | { |
1655 | { |
2611 | LOG (llevError, "Asked to send a non-spell object as a spell"); |
1656 | LOG (llevError, "Asked to send a non-spell object as a spell"); |
2612 | return; |
1657 | return; |
2613 | } |
1658 | } |
2614 | else |
1659 | else |
2615 | append_spell (pl, &sl, spell); |
1660 | append_spell (pl, sl, spell); |
|
|
1661 | |
2616 | if (sl.len >= MAXSOCKBUF) |
1662 | if (sl.length () >= MAXSOCKBUF) |
2617 | { |
1663 | { |
2618 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
1664 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2619 | fatal (0); |
1665 | fatal (0); |
2620 | } |
1666 | } |
|
|
1667 | |
2621 | /* finally, we can send the packet */ |
1668 | /* finally, we can send the packet */ |
2622 | Send_With_Handling (&pl->socket, &sl); |
1669 | pl->ns->send_packet (sl); |
2623 | free (sl.buf); |
|
|
2624 | } |
1670 | } |
|
|
1671 | |