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

Diff Legend

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