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.18 by root, Thu Sep 14 19:08:41 2006 UTC vs.
Revision 1.146 by root, Sat Dec 27 01:25:00 2008 UTC

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

Diff Legend

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