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

Diff Legend

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