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

Diff Legend

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