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