ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.34 by root, Thu Dec 14 01:59:10 2006 UTC vs.
Revision 1.150 by root, Mon Oct 12 14:00:59 2009 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines