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