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.27 by root, Wed Dec 13 18:08:02 2006 UTC vs.
Revision 1.145 by root, Fri Dec 26 10:44:17 2008 UTC

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

Diff Legend

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