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

Diff Legend

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