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.24 by root, Tue Sep 19 22:05:55 2006 UTC vs.
Revision 1.152 by root, Tue Oct 20 07:18:11 2009 UTC

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

Diff Legend

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