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.73 by root, Wed Mar 14 00:04:59 2007 UTC vs.
Revision 1.189 by root, Wed Oct 31 09:17:14 2012 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 (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001 Mark Wedel 5 * Copyright (©) 2001 Mark Wedel
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * 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
9 * 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
10 * the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 17 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
23 */ 21 *
22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */
24
25//+GPL
24 26
25/** 27/**
26 * \file 28 * \file
27 * Client handling. 29 * Client handling.
28 * 30 *
… …
42 44
43#include <global.h> 45#include <global.h>
44#include <sproto.h> 46#include <sproto.h>
45 47
46#include <living.h> 48#include <living.h>
47#include <commands.h>
48 49
49/* 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,
50 * it should work here. 51 * it should work here.
51 */ 52 */
52#include <sys/types.h> 53#include <sys/types.h>
… …
64 * This table translates the attack numbers as used within the 65 * This table translates the attack numbers as used within the
65 * 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
66 * 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
67 * client. 68 * client.
68 */ 69 */
69short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS, 70static short atnr_cs_stat[NROFATTACKS] =
70 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC, 71{
71 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID, 72 CS_STAT_RES_PHYS,
72 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ , 73 CS_STAT_RES_MAG,
73 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 74 CS_STAT_RES_FIRE,
74 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD, 75 CS_STAT_RES_ELEC,
75 CS_STAT_RES_FEAR, -1 /* Cancellation */ , 76 CS_STAT_RES_COLD,
76 CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH, 77 CS_STAT_RES_CONF,
77 -1 /* Chaos */ , -1 /* Counterspell */ , 78 CS_STAT_RES_ACID,
78 -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,
79 CS_STAT_RES_BLIND, 94 CS_STAT_RES_BLIND,
80 -1, /* Internal */ 95 -1, /* Internal */
81 -1, /* life stealing */ 96 -1, /* life stealing */
82 -1 /* Disease - not fully done yet */ 97 -1 /* Disease - not fully done yet */
83}; 98};
… …
99 */ 114 */
100 mx = ns->mapx; 115 mx = ns->mapx;
101 my = ns->mapy; 116 my = ns->mapy;
102 117
103 /* 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
104 * (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,
105 * if the destination x or y coordinate is outside the viewable 120 * if the destination x or y coordinate is outside the viewable
106 * area, we clear the values - otherwise, the old values 121 * area, we clear the values - otherwise, the old values
107 * 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.
108 */ 123 */
109 for (x = 0; x < mx; x++) 124 for (x = 0; x < mx; x++)
110 {
111 for (y = 0; y < my; y++) 125 for (y = 0; y < my; y++)
112 {
113 if (x >= ns->mapx || y >= ns->mapy) 126 if (x >= ns->mapx || y >= ns->mapy)
114 /* clear cells outside the viewable area */ 127 /* clear cells outside the viewable area */
115 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 128 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
116 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)
117 /* clear newly visible tiles within the viewable area */ 130 /* clear newly visible tiles within the viewable area */
118 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 131 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
119 else 132 else
120 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));
121 }
122 }
123 134
124 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 135 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
125 136
126 /* 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
127 * empty). 138 * empty).
… …
130} 141}
131 142
132static void 143static void
133clear_map (player *pl) 144clear_map (player *pl)
134{ 145{
146 pl->ns->mapinfo_queue_clear ();
147
135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 148 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
136 149
137 if (pl->ns->newmapcmd == 1) 150 pl->ns->force_newmap = false;
138 pl->ns->send_packet ("newmap"); 151 pl->ns->send_packet ("newmap");
139
140 pl->ns->floorbox_reset (); 152 pl->ns->floorbox_reset ();
153}
154
155static void
156send_map_info (player *pl)
157{
158 client &socket = *pl->ns;
159 object *ob = pl->viewpoint;
160
161 if (socket.mapinfocmd)
162 {
163 if (ob->map && ob->map->path)
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
181 socket.send_packet ("mapinfo current");
182 }
141} 183}
142 184
143/** check for map/region change and send new map data */ 185/** check for map/region change and send new map data */
144static void 186static void
145check_map_change (player *pl) 187check_map_change (player *pl)
146{ 188{
147 client &socket = *pl->ns; 189 client &socket = *pl->ns;
148 object *ob = pl->ob; 190 object *ob = pl->viewpoint;
149 char buf[MAX_BUF]; /* eauugggh */
150 191
151 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;
152 { 197 }
198
199 // first try to avoid 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);
153 socket.current_map = ob->map; 222 socket.current_map = ob->map;
154 223 send_map_info (pl);
155 clear_map (pl);
156
157 if (socket.mapinfocmd)
158 {
159 if (ob->map && ob->map->path[0])
160 {
161 int flags = 0;
162
163 if (ob->map->tile_path[0])
164 flags |= 1;
165 if (ob->map->tile_path[1])
166 flags |= 2;
167 if (ob->map->tile_path[2])
168 flags |= 4;
169 if (ob->map->tile_path[3])
170 flags |= 8;
171
172 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
173 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
174 }
175 else
176 snprintf (buf, MAX_BUF, "mapinfo current");
177
178 socket.send_packet (buf);
179 }
180 } 224 }
181 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)
182 { 226 {
183 int dx = ob->x - socket.current_x; 227 int dx = ob->x - socket.current_x;
184 int dy = ob->y - socket.current_y; 228 int dy = ob->y - socket.current_y;
185 229
186 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
187 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
188 else
189 {
190 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);
191 socket.floorbox_reset (); 231 socket.floorbox_reset ();
192 }
193 } 232 }
194 233
195 socket.current_x = ob->x; 234 socket.current_x = ob->x;
196 socket.current_y = ob->y; 235 socket.current_y = ob->y;
236}
197 237
198 region *reg = ob->region (); 238/**
199 if (socket.current_region != reg) 239 * This sends the skill number to name mapping. We ignore
200 { 240 * the params - we always send the same info no matter what.
201 socket.current_region = reg; 241 */
202 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname); 242static void
203 } 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);
204} 275}
205 276
206/** 277/**
207 * RequestInfo is sort of a meta command. There is some specific 278 * RequestInfo is sort of a meta command. There is some specific
208 * request of information, but we call other functions to provide 279 * request of information, but we call other functions to provide
209 * that information. 280 * that information.
210 */ 281 */
211void 282void
212RequestInfo (char *buf, int len, client * ns) 283RequestInfo (char *buf, int len, client *ns)
213{ 284{
214 char *params = NULL, *cp; 285 char *params;
215
216 /* No match */
217 char bigbuf[MAX_BUF];
218 int slen;
219
220 /* Set up replyinfo before we modify any of the buffers - this is used
221 * if we don't find a match.
222 */
223 strcpy (bigbuf, "replyinfo ");
224 slen = strlen (bigbuf);
225 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
226 286
227 /* find the first space, make it null, and update the 287 /* find the first space, make it null, and update the
228 * params pointer. 288 * params pointer.
229 */ 289 */
230 for (cp = buf; *cp != '\0'; cp++) 290 for (params = buf; *params; params++)
231 if (*cp == ' ') 291 if (*params == ' ')
232 { 292 {
233 *cp = '\0';
234 params = cp + 1; 293 *params++ = 0;
235 break; 294 break;
236 } 295 }
237 296
238 if (!strcmp (buf, "image_info"))
239 send_image_info (ns, params);
240 else if (!strcmp (buf, "image_sums"))
241 send_image_sums (ns, params);
242 else if (!strcmp (buf, "skill_info")) 297 if (!strcmp (buf, "skill_info"))
243 send_skill_info (ns, params); 298 send_skill_info (ns, params);
244 else if (!strcmp (buf, "spell_paths")) 299 else if (!strcmp (buf, "spell_paths"))
245 send_spell_paths (ns, params); 300 send_spell_paths (ns, params);
246 else 301 else
247 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 }
248} 309}
249 310
250void 311void
251ExtCmd (char *buf, int len, player *pl) 312ExtCmd (char *buf, int len, player *pl)
252{ 313{
… …
255 316
256void 317void
257ExtiCmd (char *buf, int len, client *ns) 318ExtiCmd (char *buf, int len, client *ns)
258{ 319{
259 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 (IN_RANGE_EXC (dir, 0, 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;
260} 419}
261 420
262void 421void
263MapInfoCmd (char *buf, int len, player *pl) 422MapInfoCmd (char *buf, int len, player *pl)
264{ 423{
265 // <mapinfo tag spatial tile-path 424 // <mapinfo tag spatial tile-path
266 // >mapinfo tag spatial flags x y w h hash 425 // >mapinfo tag spatial flags x y w h hash
267 426
268 char bigbuf[MAX_BUF], *token;
269
270 token = buf; 427 char *token = buf;
271 // copy token 428
272 if (!(buf = strchr (buf, ' '))) 429 if (!(buf = strchr (buf, ' ')))
273 return; 430 return;
274 431
275 *buf++ = 0;
276
277 if (!strncmp (buf, "spatial ", 8)) 432 if (!strncmp (buf, " spatial ", 9))
278 { 433 {
279 buf += 8; 434 char *copy = strdup (token);
435 copy [buf - token] = 0;
280 436
281 // initial map and its origin 437#if 0
282 maptile *map = pl->ob->map; 438 // this makes only sense when we flush the buffer immediately
283 sint16 dx, dy; 439 if (pl->ns->mapinfo_try (copy))
284 int mapx = pl->ns->mapx / 2 - pl->ob->x; 440 free (copy);
285 int mapy = pl->ns->mapy / 2 - pl->ob->y;
286 int max_distance = 8; // limit maximum path length to something generous
287
288 while (*buf && map && max_distance)
289 {
290 int dir = *buf++;
291
292 switch (dir)
293 {
294 case '1':
295 dx = 0;
296 dy = -1;
297 map = map->xy_find (dx, dy);
298 map && (mapy -= map->height);
299 break;
300 case '2':
301 mapx += map->width;
302 dx = map->width;
303 dy = 0;
304 map = map->xy_find (dx, dy);
305 break;
306 case '3':
307 mapy += map->height;
308 dx = 0;
309 dy = map->height;
310 map = map->xy_find (dx, dy);
311 break;
312 case '4':
313 dx = -1;
314 dy = 0;
315 map = map->xy_find (dx, dy);
316 map && (mapx -= map->width);
317 break;
318 }
319
320 --max_distance;
321 }
322
323 if (!max_distance)
324 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
325 else if (map && map->path[0])
326 {
327 int flags = 0;
328
329 if (map->tile_path[0])
330 flags |= 1;
331 if (map->tile_path[1])
332 flags |= 2;
333 if (map->tile_path[2])
334 flags |= 4;
335 if (map->tile_path[3])
336 flags |= 8;
337
338 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
339 }
340 else 441 else
341 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 442#endif
443 pl->ns->mapinfo_queue.push_back (copy);
342 } 444 }
343 else 445 else
344 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 446 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
345
346 pl->ns->send_packet (bigbuf);
347} 447}
348 448
349/** This is the Setup cmd - easy first implementation */ 449/** This is the Setup cmd */
350void 450void
351SetUp (char *buf, int len, client * ns) 451SetUp (char *buf, int len, client * ns)
352{ 452{
353 int s, slen; 453 INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
354 char *cmd, *param, cmdback[HUGE_BUF];
355
356 /* run through the cmds of setup
357 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
358 *
359 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
360 * The client then must sort this out
361 */
362
363 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
364
365 strcpy (cmdback, "setup");
366 for (s = 0; s < len; )
367 {
368 cmd = &buf[s];
369
370 /* find the next space, and put a null there */
371 for (; buf[s] && buf[s] != ' '; s++)
372 ;
373
374 buf[s++] = 0;
375
376 while (buf[s] == ' ')
377 s++;
378
379 if (s >= len)
380 break;
381
382 param = &buf[s];
383
384 for (; buf[s] && buf[s] != ' '; s++)
385 ;
386
387 buf[s++] = 0;
388
389 while (buf[s] == ' ')
390 s++;
391
392 slen = strlen (cmdback);
393 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
394 safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
395 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
396
397 if (!strcmp (cmd, "sound"))
398 {
399 ns->sound = atoi (param);
400 safe_strcat (cmdback, param, &slen, HUGE_BUF);
401 }
402 else if (!strcmp (cmd, "exp64"))
403 safe_strcat (cmdback, param, &slen, HUGE_BUF);
404 else if (!strcmp (cmd, "spellmon"))
405 {
406 ns->monitor_spells = atoi (param);
407 safe_strcat (cmdback, param, &slen, HUGE_BUF);
408 }
409 else if (!strcmp (cmd, "darkness"))
410 {
411 ns->darkness = atoi (param);
412 safe_strcat (cmdback, param, &slen, HUGE_BUF);
413 }
414 else if (!strcmp (cmd, "map1cmd"))
415 {
416 if (atoi (param))
417 ns->mapmode = Map1Cmd;
418 /* if beyond this size, need to use map1cmd no matter what */
419 if (ns->mapx > 11 || ns->mapy > 11)
420 ns->mapmode = Map1Cmd;
421 safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
422 }
423 else if (!strcmp (cmd, "map1acmd"))
424 {
425 if (atoi (param))
426 ns->mapmode = Map1aCmd;
427 /* if beyond this size, need to use map1acmd no matter what */
428 if (ns->mapx > 11 || ns->mapy > 11)
429 ns->mapmode = Map1aCmd;
430 safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
431 }
432 else if (!strcmp (cmd, "newmapcmd"))
433 {
434 ns->newmapcmd = atoi (param);
435 safe_strcat (cmdback, param, &slen, HUGE_BUF);
436 }
437 else if (!strcmp (cmd, "mapinfocmd"))
438 {
439 ns->mapinfocmd = atoi (param);
440 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
441 }
442 else if (!strcmp (cmd, "extcmd"))
443 {
444 ns->extcmd = atoi (param);
445 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
446 }
447 else if (!strcmp (cmd, "extmap"))
448 {
449 ns->extmap = atoi (param);
450 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
451 }
452 else if (!strcmp (cmd, "facecache"))
453 {
454 ns->facecache = atoi (param);
455 safe_strcat (cmdback, param, &slen, HUGE_BUF);
456 }
457 else if (!strcmp (cmd, "faceset"))
458 {
459 char tmpbuf[20];
460 int q = atoi (param);
461
462 if (is_valid_faceset (q))
463 ns->faceset = q;
464 sprintf (tmpbuf, "%d", ns->faceset);
465 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
466 /* if the client is using faceset, it knows about image2 command */
467 ns->image2 = 1;
468 }
469 else if (!strcmp (cmd, "itemcmd"))
470 {
471 /* Version of the item protocol command to use. Currently,
472 * only supported versions are 1 and 2. Using a numeric
473 * value will make it very easy to extend this in the future.
474 */
475 char tmpbuf[20];
476 int q = atoi (param);
477
478 if (q < 1 || q > 2)
479 {
480 strcpy (tmpbuf, "FALSE");
481 }
482 else
483 {
484 ns->itemcmd = q;
485 sprintf (tmpbuf, "%d", ns->itemcmd);
486 }
487 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
488 }
489 else if (!strcmp (cmd, "mapsize"))
490 {
491 int x, y = 0;
492 char tmpbuf[MAX_BUF], *cp;
493
494 x = atoi (param);
495 for (cp = param; *cp != 0; cp++)
496 if (*cp == 'x' || *cp == 'X')
497 {
498 y = atoi (cp + 1);
499 break;
500 }
501
502 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
503 {
504 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
505 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
506 }
507 else
508 {
509 ns->mapx = x;
510 ns->mapy = y;
511 /* better to send back what we are really using and not the
512 * param as given to us in case it gets parsed differently.
513 */
514 sprintf (tmpbuf, "%dx%d", x, y);
515 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
516 /* If beyond this size and still using orig map command, need to
517 * go to map1cmd.
518 */
519 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
520 ns->mapmode = Map1Cmd;
521 }
522 }
523 else if (!strcmp (cmd, "extendedMapInfos"))
524 {
525 /* Added by tchize
526 * prepare to use the mapextended command
527 */
528 char tmpbuf[20];
529
530 ns->ext_mapinfos = (atoi (param));
531 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
532 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
533 }
534 else if (!strcmp (cmd, "extendedTextInfos"))
535 {
536 /* Added by tchize
537 * prepare to use the extended text commands
538 * Client toggle this to non zero to get exttext
539 */
540 char tmpbuf[20];
541
542 ns->has_readable_type = (atoi (param));
543 sprintf (tmpbuf, "%d", ns->has_readable_type);
544 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
545 }
546 else
547 {
548 /* Didn't get a setup command we understood -
549 * report a failure to the client.
550 */
551 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
552 }
553 } /* for processing all the setup commands */
554
555 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
556 ns->send_packet (cmdback);
557} 454}
558 455
559/** 456/**
560 * The client has requested to be added to the game. 457 * The client has requested to be added to the game.
561 * 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.
562 * 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,
563 * 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.
564 */ 461 */
565void 462void
566AddMeCmd (char *buf, int len, client * ns) 463AddMeCmd (char *buf, int len, client *ns)
567{ 464{
568 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 465 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
569} 466}
570 467
571/** Reply to ExtendedInfos command */ 468//+GPL
572void
573ToggleExtendedInfos (char *buf, int len, client * ns)
574{
575 char cmdback[MAX_BUF];
576 char command[50];
577 int info, nextinfo;
578
579 cmdback[0] = '\0';
580 nextinfo = 0;
581
582 while (1)
583 {
584 /* 1. Extract an info */
585 info = nextinfo;
586
587 while ((info < len) && (buf[info] == ' '))
588 info++;
589
590 if (info >= len)
591 break;
592
593 nextinfo = info + 1;
594
595 while ((nextinfo < len) && (buf[nextinfo] != ' '))
596 nextinfo++;
597
598 if (nextinfo - info >= 49) /*Erroneous info asked */
599 continue;
600
601 strncpy (command, &(buf[info]), nextinfo - info);
602
603 /* 2. Interpret info */
604 if (!strcmp ("smooth", command))
605 /* Toggle smoothing */
606 ns->EMI_smooth = !ns->EMI_smooth;
607 else
608 /*bad value */;
609
610 /*3. Next info */
611 }
612
613 strcpy (cmdback, "ExtendedInfoSet");
614
615 if (ns->EMI_smooth)
616 {
617 strcat (cmdback, " ");
618 strcat (cmdback, "smoothing");
619 }
620
621 ns->send_packet (cmdback);
622}
623
624/*
625#define MSG_TYPE_BOOK 1
626#define MSG_TYPE_CARD 2
627#define MSG_TYPE_PAPER 3
628#define MSG_TYPE_SIGN 4
629#define MSG_TYPE_MONUMENT 5
630#define MSG_TYPE_SCRIPTED_DIALOG 6*/
631
632/** Reply to ExtendedInfos command */
633void
634ToggleExtendedText (char *buf, int len, client * ns)
635{
636 char cmdback[MAX_BUF];
637 char temp[10];
638 char command[50];
639 int info, nextinfo, i, flag;
640
641 cmdback[0] = '\0';
642
643 nextinfo = 0;
644 while (1)
645 {
646 /* 1. Extract an info */
647 info = nextinfo;
648
649 while ((info < len) && (buf[info] == ' '))
650 info++;
651
652 if (info >= len)
653 break;
654
655 nextinfo = info + 1;
656
657 while ((nextinfo < len) && (buf[nextinfo] != ' '))
658 nextinfo++;
659
660 if (nextinfo - info >= 49) /*Erroneous info asked */
661 continue;
662
663 strncpy (command, &(buf[info]), nextinfo - info);
664 command[nextinfo - info] = '\0';
665 /* 2. Interpret info */
666 i = sscanf (command, "%d", &flag);
667
668 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
669 ns->supported_readables |= (1 << flag);
670 /*3. Next info */
671 }
672
673 /* Send resulting state */
674 strcpy (cmdback, "ExtendedTextSet");
675
676 for (i = 0; i <= MSG_TYPE_LAST; i++)
677 if (ns->supported_readables & (1 << i))
678 {
679 strcat (cmdback, " ");
680 snprintf (temp, sizeof (temp), "%d", i);
681 strcat (cmdback, temp);
682 }
683
684 ns->send_packet (cmdback);
685}
686
687/**
688 * Tells client the picture it has to use
689 * to smooth a picture number given as argument.
690 */
691void
692AskSmooth (char *buf, int len, client *ns)
693{
694 ns->send_smooth (atoi (buf));
695}
696 469
697/** 470/**
698 * 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,
699 * etc.) 472 * etc.)
700 */ 473 */
… …
713 return; 486 return;
714 487
715 buf++; 488 buf++;
716 } 489 }
717 490
718 execute_newserver_command (pl->ob, (char *) buf); 491 execute_newserver_command (pl->ob, (char *)buf);
719 492
720 /* Perhaps something better should be done with a left over count. 493 /* Perhaps something better should be done with a left over count.
721 * Cleaning up the input should probably be done first - all actions 494 * Cleaning up the input should probably be done first - all actions
722 * 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
723 * commands. 496 * commands.
724 */ 497 */
725 pl->count = 0; 498 pl->count = 0;
726} 499}
727 500
728
729/** 501/**
730 * 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,
731 * 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
732 * '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
733 * can throttle. 505 * can throttle.
… …
735void 507void
736NewPlayerCmd (char *buf, int len, player *pl) 508NewPlayerCmd (char *buf, int len, player *pl)
737{ 509{
738 if (len <= 6) 510 if (len <= 6)
739 { 511 {
740 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);
741 return; 513 return;
742 } 514 }
743 515
744 uint16 cmdid = net_uint16 ((uint8 *)buf); 516 uint16 cmdid = net_uint16 ((uint8 *)buf);
745 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 517 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
758 * commands. 530 * commands.
759 */ 531 */
760 pl->count = 0; 532 pl->count = 0;
761 533
762 //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
763 int time = fabs (pl->ob->speed) < 0.001 535 int time = pl->ob->has_active_speed ()
764 ? time = MAX_TIME * 100
765 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 536 ? (int) (MAX_TIME / pl->ob->speed)
537 : MAX_TIME * 100;
766 538
767 /* Send confirmation of command execution now */ 539 /* Send confirmation of command execution now */
768 packet sl ("comc"); 540 packet sl ("comc");
769 sl << uint16 (cmdid) << uint32 (time); 541 sl << uint16 (cmdid) << uint32 (time);
770 pl->ns->send_packet (sl); 542 pl->ns->send_packet (sl);
… …
802 { 574 {
803 case ST_PLAYING: 575 case ST_PLAYING:
804 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 576 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
805 break; 577 break;
806 578
807 case ST_CHANGE_CLASS:
808 key_change_class (pl->ob, buf[0]);
809 break;
810
811 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 579 case ST_GET_PARTY_PASSWORD: /* Get password for party */
812 receive_party_password (pl->ob, 13); 580 receive_party_password (pl->ob, 13);
813 break; 581 break;
814 582
815 default: 583 default:
816 LOG (llevError, "Unknown input state: %d\n", ns->state); 584 LOG (llevError, "Unknown input state: %d\n", ns->state);
817 } 585 }
818} 586}
819 587
820/** 588/**
821 * Client tells its version. If there is a mismatch, we close the 589 * Client tells its version info.
822 * socket. In real life, all we should care about is the client having
823 * something older than the server. If we assume the client will be
824 * backwards compatible, having it be a later version should not be a
825 * problem.
826 */ 590 */
827void 591void
828VersionCmd (char *buf, int len, client * ns) 592VersionCmd (char *buf, int len, client *ns)
829{ 593{
830 if (!buf) 594 INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
831 {
832 LOG (llevError, "CS: received corrupted version command\n");
833 return;
834 }
835
836 ns->cs_version = atoi (buf);
837 ns->sc_version = ns->cs_version;
838
839 LOG (llevDebug, "connection from client <%s>\n", buf);
840
841 //TODO: should log here just for statistics
842
843 //if (VERSION_CS != ns->cs_version)
844 // unchecked;
845
846 char *cp = strchr (buf + 1, ' ');
847 if (!cp)
848 return;
849
850 ns->sc_version = atoi (cp);
851
852 //if (VERSION_SC != ns->sc_version)
853 // unchecked;
854
855 cp = strchr (cp + 1, ' ');
856
857 if (cp)
858 {
859 assign (ns->version, cp + 1);
860
861 if (ns->sc_version < 1026)
862 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
863 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
864 }
865} 595}
866 596
867/** sound related functions. */ 597/** sound related functions. */
868void 598void
869SetSound (char *buf, int len, client * ns) 599SetSound (char *buf, int len, client * ns)
… …
887 * syntax is: move (to) (tag) (nrof) 617 * syntax is: move (to) (tag) (nrof)
888 */ 618 */
889void 619void
890MoveCmd (char *buf, int len, player *pl) 620MoveCmd (char *buf, int len, player *pl)
891{ 621{
892 int vals[3], i; 622 int to, tag, nrof;
893 623
894 /* A little funky here. We only cycle for 2 records, because 624 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
895 * we obviously are not going to find a space after the third
896 * record. Perhaps we should just replace this with a
897 * sscanf?
898 */
899 for (i = 0; i < 2; i++)
900 { 625 {
901 vals[i] = atoi (buf);
902
903 if (!(buf = strchr (buf, ' ')))
904 {
905 LOG (llevError, "Incomplete move command: %s\n", buf); 626 LOG (llevError, "Incomplete move command: %s\n", buf);
906 return; 627 return;
907 }
908
909 buf++;
910 } 628 }
911 629
912 vals[2] = atoi (buf); 630 esrv_move_object (pl->ob, to, tag, nrof);
913
914/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
915 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
916} 631}
917 632
918/****************************************************************************** 633/******************************************************************************
919 * 634 *
920 * Start of commands the server sends to the client. 635 * Start of commands the server sends to the client.
… …
924/** 639/**
925 * 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
926 * 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)
927 */ 642 */
928void 643void
929send_query (client *ns, uint8 flags, char *text) 644send_query (client *ns, uint8 flags, const char *text)
930{ 645{
931 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);
932} 685}
933 686
934#define AddIfInt64(Old,New,Type) if (Old != New) {\ 687#define AddIfInt64(Old,New,Type) if (Old != New) {\
935 Old = New; \ 688 Old = New; \
936 sl << uint8 (Type) << uint64 (New); \ 689 sl << uint8 (Type) << uint64 (New); \
… …
944#define AddIfShort(Old,New,Type) if (Old != New) {\ 697#define AddIfShort(Old,New,Type) if (Old != New) {\
945 Old = New; \ 698 Old = New; \
946 sl << uint8 (Type) << uint16 (New); \ 699 sl << uint8 (Type) << uint16 (New); \
947 } 700 }
948 701
949#define AddIfFloat(Old,New,Type) if (Old != New) {\ 702#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
950 Old = New; \ 703 Old = New; \
951 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 704 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
952 } 705 }
953 706
954#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 707#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
955 free(Old); Old = strdup (New);\ 708 free(Old); Old = strdup (New);\
956 sl << uint8 (Type) << data8 (New); \ 709 sl << uint8 (Type) << data8 (New); \
… …
963 * commands for now. 716 * commands for now.
964 */ 717 */
965void 718void
966esrv_update_stats (player *pl) 719esrv_update_stats (player *pl)
967{ 720{
968 char buf[MAX_BUF];
969 uint16 flags;
970
971 client *ns = pl->ns; 721 client *ns = pl->ns;
972 if (!ns) 722 if (!ns)
973 return; 723 return;
974 724
975 object *ob = pl->ob; 725 object *ob = pl->observe;
976 if (!ob) 726 if (!ob)
977 return; 727 return;
728
729 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
978 730
979 packet sl ("stats"); 731 packet sl ("stats");
980 732
981 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 733 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
982 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 734 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
990 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 742 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
991 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 743 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
992 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 744 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
993 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 745 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
994 746
995 for (int s = 0; s < NUM_SKILLS; s++) 747 for (int s = 0; s < CS_NUM_SKILLS; s++)
996 if (object *skill = pl->last_skill_ob[s]) 748 if (object *skill = opl->last_skill_ob [s])
997 if (skill->stats.exp != ns->last_skill_exp [s]) 749 if (skill->stats.exp != ns->last_skill_exp [s])
998 { 750 {
999 ns->last_skill_exp [s] = skill->stats.exp; 751 ns->last_skill_exp [s] = skill->stats.exp;
1000 752
1001 /* Always send along the level if exp changes. This is only 753 /* Always send along the level if exp changes. This is only
1002 * 1 extra byte, but keeps processing simpler. 754 * 1 extra byte, but keeps processing simpler.
1003 */ 755 */
1004 sl << uint8 (s + CS_STAT_SKILLINFO) 756 sl << uint8 (CS_STAT_SKILLINFO + s)
1005 << uint8 (skill->level) 757 << uint8 (skill->level)
1006 << uint64 (skill->stats.exp); 758 << uint64 (skill->stats.exp);
1007 } 759 }
1008 760
1009 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 761 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1010 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 762 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1011 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 763 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1012 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 764 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1013 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 765 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1014 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 766 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
1015 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 767 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1016 AddIfFloat (ns->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);
1017 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 769 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1018 770
1019 flags = 0; 771 int flags = (opl->fire_on ? SF_FIREON : 0)
1020 772 | (opl->run_on ? SF_RUNON : 0);
1021 if (pl->fire_on)
1022 flags |= SF_FIREON;
1023
1024 if (pl->run_on)
1025 flags |= SF_RUNON;
1026 773
1027 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 774 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1028 775
1029 if (ns->sc_version < 1025)
1030 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1031 else
1032 for (int i = 0; i < NROFATTACKS; i++) 776 for (int i = 0; i < NROFATTACKS; i++)
1033 {
1034 /* Skip ones we won't send */ 777 /* Skip ones we won't send */
1035 if (atnr_cs_stat[i] == -1) 778 if (atnr_cs_stat[i] >= 0)
1036 continue;
1037
1038 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 779 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1039 }
1040 780
1041 if (pl->ns->monitor_spells) 781 if (pl->ns->monitor_spells)
1042 { 782 {
1043 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 783 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1044 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 784 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1045 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 785 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1046 } 786 }
1047 787
788 char buf[MAX_BUF];
1048 rangetostring (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 */
1049 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 790 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1050 set_title (ob, buf); 791 set_title (ob, buf);
1051 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 792 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1052 793
1053 /* Only send it away if we have some actual data */ 794 /* Only send it away if we have some actual data */
… …
1057 798
1058/** 799/**
1059 * 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.
1060 */ 801 */
1061void 802void
1062esrv_new_player (player *pl, uint32 weight) 803esrv_new_player (player *pl)
1063{ 804{
805 sint32 weight = pl->ob->client_weight ();
806
1064 packet sl ("player"); 807 packet sl ("player");
1065 808
1066 sl << uint32 (pl->ob->count) 809 sl << uint32 (pl->ob->count)
1067 << uint32 (weight) 810 << uint32 (weight)
1068 << uint32 (pl->ob->face) 811 << uint32 (pl->ob->face)
1069 << data8 (pl->ob->name); 812 << data8 (pl->ob->name);
1070 813
1071 pl->ns->last_weight = weight; 814 pl->ns->last_weight = weight;
1072 pl->ns->send_packet (sl); 815 pl->ns->send_packet (sl);
1073 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1074} 816}
1075 817
1076/****************************************************************************** 818/******************************************************************************
1077 * 819 *
1078 * Start of map related commands. 820 * Start of map related commands.
… …
1081 823
1082/** Clears a map cell */ 824/** Clears a map cell */
1083static void 825static void
1084map_clearcell (struct MapCell *cell, int count) 826map_clearcell (struct MapCell *cell, int count)
1085{ 827{
1086 cell->faces[0] = 0; 828 cell->faces[0] = 0;
1087 cell->faces[1] = 0; 829 cell->faces[1] = 0;
1088 cell->faces[2] = 0; 830 cell->faces[2] = 0;
831 cell->smooth[0] = 0;
832 cell->smooth[1] = 0;
833 cell->smooth[2] = 0;
1089 cell->count = count; 834 cell->count = count;
1090 cell->stat_hp = 0; 835 cell->stat_hp = 0;
1091 cell->flags = 0; 836 cell->flags = 0;
1092 cell->player = 0; 837 cell->player = 0;
1093} 838}
1094 839
1095#define MAX_LAYERS 3 840#define MAX_LAYERS 3
1096 841
1097/** 842/**
… …
1100 * it was. 845 * it was.
1101 * sl is the socklist this data is going into. 846 * sl is the socklist this data is going into.
1102 * 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
1103 * 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
1104 * entire player object. 849 * entire player object.
1105 * mx and my are map coordinate offsets for map mp
1106 * sx and sy are the offsets into the socket structure that
1107 * holds the old values.
1108 * 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
1109 * 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)
1110 * take. Interesting to note that before this function, the map1 function 852 * take. Interesting to note that before this function, the map1 function
1111 * numbers the spaces differently - I think this was a leftover from 853 * numbers the spaces differently - I think this was a leftover from
1112 * 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
1113 * 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
1114 * actually match. 856 * actually match.
1115 */ 857 */
1116static int 858static int
1117update_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)
1118{ 860{
1119 uint16 face_num; 861 object *ob = ms.faces_obj [layer];
1120 int bx, by, i;
1121
1122 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1123 862
1124 /* 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
1125 * is the blank face, set the face number to zero. 864 * is the blank face, set the face number to zero.
1126 * 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
1127 * precedence over the other object for this space. 866 * precedence over the other object for this space.
1128 * otherwise, we do special head processing 867 * otherwise, we do special head processing
1129 */ 868 */
1130 if (!ob || ob->face == blank_face) 869 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1131 face_num = 0;
1132 else
1133 /* In this case, we are already at the lower right or single part object,
1134 * so nothing special
1135 */
1136 face_num = ob->face;
1137 870
1138 /* 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
1139 * 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.
1140 */ 873 */
1141 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 874 if (lastcell.faces[layer] != face_num)
1142 { 875 {
1143 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 876 lastcell.faces[layer] = face_num;
1144 877
1145 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 878 if (!ns.faces_sent[face_num])
1146 if (ob) 879 if (ob)
1147 ns.send_faces (ob); 880 ns.send_faces (ob);
1148 else 881 else
1149 ns.send_face (face_num); 882 ns.send_face (face_num, 10);
1150 883
1151 sl << uint16 (face_num); 884 sl << uint16 (face_num);
1152 return 1; 885 return 1;
1153 } 886 }
1154 887
1155 /* Nothing changed */ 888 /* Nothing changed */
1156 return 0; 889 return 0;
1157} 890}
1158 891
1159/** 892/**
1160 * This function is mainly a copy of update_space, 893 * Draws client map.
1161 * except it handles update of the smoothing updates,
1162 * not the face updates.
1163 * Removes the need to replicate the same code for each layer.
1164 * this returns true if this smooth is now in fact different
1165 * than it was.
1166 * sl is the socklist this data is going into.
1167 * ns is the socket we are working on - all the info we care
1168 * about is in this socket structure, so know need to pass the
1169 * entire player object.
1170 * mx and my are map coordinate offsets for map mp
1171 * sx and sy are the offsets into the socket structure that
1172 * holds the old values.
1173 * layer is the layer to update, with 2 being the floor and 0 the
1174 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1175 * take.
1176 */
1177static inline int
1178update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1179{
1180 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1181
1182 /* If there is no object for this space, or if the face for the object
1183 * is the blank face, set the smoothlevel to zero.
1184 */ 894 */
1185 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1186
1187 /* We've gotten what face we want to use for the object. Now see if
1188 * if it has changed since we last sent it to the client.
1189 */
1190 if (smoothlevel > 255)
1191 smoothlevel = 255;
1192 else if (smoothlevel < 0)
1193 smoothlevel = 0;
1194
1195 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1196 {
1197 if (smoothlevel)
1198 ns.send_smooth (ob->face);
1199
1200 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1201 sl << uint8 (smoothlevel);
1202 return 1;
1203 }
1204
1205 /* Nothing changed */
1206 return 0;
1207}
1208
1209/**
1210 * Returns the size of a data for a map square as returned by
1211 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1212 * available.
1213 */
1214int
1215getExtendedMapInfoSize (client * ns)
1216{
1217 int result = 0;
1218
1219 if (ns->ext_mapinfos)
1220 {
1221 if (ns->EMI_smooth)
1222 result += 1; /*One byte for smoothlevel */
1223 }
1224
1225 return result;
1226}
1227
1228// prefetch (and touch) all maps within a specific distancd
1229static void
1230prefetch_surrounding_maps (maptile *map, int distance)
1231{
1232 map->last_access = runtime;
1233
1234 if (--distance)
1235 for (int dir = 4; --dir; )
1236 if (const shstr &path = map->tile_path [dir])
1237 if (maptile *&neigh = map->tile_map [dir])
1238 prefetch_surrounding_maps (neigh, distance);
1239 else
1240 neigh = maptile::find_async (path, map);
1241}
1242
1243// prefetch a generous area around the player
1244static void
1245prefetch_surrounding_maps (object *op)
1246{
1247 prefetch_surrounding_maps (op->map, 3);
1248}
1249
1250/**
1251 * This function uses the new map1 protocol command to send the map
1252 * to the client. It is necessary because the old map command supports
1253 * a maximum map size of 15x15.
1254 * This function is much simpler than the old one. This is because
1255 * the old function optimized to send as few face identifiers as possible,
1256 * at the expense of sending more coordinate location (coordinates were
1257 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1258 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1259 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1260 * and use the other 4 bits for other informatiion. For full documentation
1261 * of what we send, see the doc/Protocol file.
1262 * I will describe internally what we do:
1263 * the ns->lastmap shows how the map last looked when sent to the client.
1264 * in the lastmap structure, there is a cells array, which is set to the
1265 * maximum viewable size (As set in config.h).
1266 * in the cells, there are faces and a count value.
1267 * we use the count value to hold the darkness value. If -1, then this space
1268 * is not viewable.
1269 * we use faces[0] faces[1] faces[2] to hold what the three layers
1270 * look like.
1271 */
1272void 895void
1273draw_client_map1 (object *pl) 896draw_client_map (player *pl)
1274{ 897{
1275 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 898 object *ob = pl->viewpoint;
1276 sint16 nx, ny;
1277 int estartlen, eoldlen;
1278 uint8 eentrysize;
1279 uint16 ewhatstart, ewhatflag;
1280 uint8 extendedinfos;
1281 maptile *m;
1282
1283 client &socket = *pl->contr->ns;
1284
1285 if (!pl->active) 899 if (!pl->observe->active)
1286 return; 900 return;
1287
1288 check_map_change (pl->contr);
1289 prefetch_surrounding_maps (pl);
1290
1291 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1292 packet esl;
1293
1294 startlen = sl.length ();
1295
1296 /*Extendedmapinfo structure initialisation */
1297 if (socket.ext_mapinfos)
1298 {
1299 extendedinfos = EMI_NOREDRAW;
1300
1301 if (socket.EMI_smooth)
1302 extendedinfos |= EMI_SMOOTH;
1303
1304 ewhatstart = esl.length ();
1305 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1306 could need to be taken away */
1307 eentrysize = getExtendedMapInfoSize (&socket);
1308 esl << "mapextended "
1309 << uint8 (extendedinfos)
1310 << uint8 (eentrysize);
1311
1312 estartlen = esl.length ();
1313 }
1314 else
1315 {
1316 /* suppress compiler warnings */
1317 ewhatstart = 0;
1318 ewhatflag = 0;
1319 estartlen = 0;
1320 }
1321
1322 /* x,y are the real map locations. ax, ay are viewport relative
1323 * locations.
1324 */
1325 ay = 0;
1326
1327 /* We could do this logic as conditionals in the if statement,
1328 * but that started to get a bit messy to look at.
1329 */
1330 max_x = pl->x + (socket.mapx + 1) / 2;
1331 max_y = pl->y + (socket.mapy + 1) / 2;
1332
1333 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1334 {
1335 ax = 0;
1336 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1337 {
1338 int emask, mask;
1339 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1340
1341 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1342
1343 /* If the coordinates are not valid, or it is too dark to see,
1344 * we tell the client as such
1345 */
1346 nx = x;
1347 ny = y;
1348 m = get_map_from_coord (pl->map, &nx, &ny);
1349
1350 if (!m)
1351 {
1352 /* space is out of map. Update space and clear values
1353 * if this hasn't already been done. If the space is out
1354 * of the map, it shouldn't have a head
1355 */
1356 if (lastcell.count != -1)
1357 {
1358 sl << uint16 (mask);
1359 map_clearcell (&lastcell, -1);
1360 }
1361
1362 continue;
1363 }
1364
1365 m->touch ();
1366
1367 int d = pl->contr->blocked_los[ax][ay];
1368
1369 if (d > 3)
1370 {
1371
1372 int need_send = 0, count;
1373
1374 /* This block deals with spaces that are not visible for whatever
1375 * reason. Still may need to send the head for this space.
1376 */
1377
1378 oldlen = sl.length ();
1379
1380 sl << uint16 (mask);
1381
1382 if (lastcell.count != -1)
1383 need_send = 1;
1384
1385 count = -1;
1386
1387 /* properly clear a previously sent big face */
1388 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1389 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1390 need_send = 1;
1391
1392 map_clearcell (&lastcell, count);
1393
1394 if ((mask & 0xf) || need_send)
1395 sl[oldlen + 1] = mask & 0xff;
1396 else
1397 sl.reset (oldlen);
1398 }
1399 else
1400 {
1401 /* In this block, the space is visible.
1402 */
1403
1404 /* Rather than try to figure out what everything that we might
1405 * need to send is, then form the packet after that,
1406 * we presume that we will in fact form a packet, and update
1407 * the bits by what we do actually send. If we send nothing,
1408 * we just back out sl.length () to the old value, and no harm
1409 * is done.
1410 * I think this is simpler than doing a bunch of checks to see
1411 * what if anything we need to send, setting the bits, then
1412 * doing those checks again to add the real data.
1413 */
1414 oldlen = sl.length ();
1415 eoldlen = esl.length ();
1416
1417 sl << uint16 (mask);
1418
1419 if (socket.ext_mapinfos)
1420 esl << uint16 (emask);
1421
1422 unsigned char dummy;
1423 unsigned char *last_ext = &dummy;
1424
1425 /* Darkness changed */
1426 if (lastcell.count != d && socket.darkness)
1427 {
1428 mask |= 0x8;
1429
1430 if (socket.extmap)
1431 {
1432 *last_ext |= 0x80;
1433 last_ext = &sl[sl.length ()];
1434 sl << uint8 (d);
1435 }
1436 else
1437 sl << uint8 (255 - 64 * d);
1438 }
1439
1440 lastcell.count = d;
1441
1442 if (socket.extmap)
1443 {
1444 uint8 stat_hp = 0;
1445 uint8 stat_width = 0;
1446 uint8 flags = 0;
1447 UUID player = 0;
1448
1449 // send hp information, if applicable
1450 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
1451 {
1452 if (op->head || op->invisible)
1453 ; // do not show
1454 else if (op->type == PLAYER
1455 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1456 {
1457 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1458 {
1459 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1460 stat_width = op->arch->tail_x;
1461 }
1462 }
1463
1464 if (op->msg && op->msg[0] == '@')
1465 flags |= 1;
1466
1467 if (op->type == PLAYER && op != pl)
1468 player = op->count;
1469 }
1470
1471 if (lastcell.stat_hp != stat_hp)
1472 {
1473 lastcell.stat_hp = stat_hp;
1474
1475 mask |= 0x8;
1476 *last_ext |= 0x80;
1477 last_ext = &sl[sl.length ()];
1478
1479 sl << uint8 (5) << uint8 (stat_hp);
1480
1481 if (stat_width > 1)
1482 {
1483 *last_ext |= 0x80;
1484 last_ext = &sl[sl.length ()];
1485
1486 sl << uint8 (6) << uint8 (stat_width);
1487 }
1488 }
1489
1490 if (lastcell.player != player)
1491 {
1492 lastcell.player = player;
1493
1494 mask |= 0x8;
1495 *last_ext |= 0x80;
1496 last_ext = &sl[sl.length ()];
1497
1498 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
1499 }
1500
1501 if (lastcell.flags != flags)
1502 {
1503 lastcell.flags = flags;
1504
1505 mask |= 0x8;
1506 *last_ext |= 0x80;
1507 last_ext = &sl[sl.length ()];
1508
1509 sl << uint8 (8) << uint8 (flags);
1510 }
1511 }
1512
1513 /* Floor face */
1514 if (update_space (sl, socket, m, nx, ny, ax, ay, 2))
1515 mask |= 0x4;
1516
1517 if (socket.EMI_smooth)
1518 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1519 emask |= 0x4;
1520
1521 /* Middle face */
1522 if (update_space (sl, socket, m, nx, ny, ax, ay, 1))
1523 mask |= 0x2;
1524
1525 if (socket.EMI_smooth)
1526 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1527 emask |= 0x2;
1528
1529 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1530 {
1531 if (lastcell.faces[0] != pl->face)
1532 {
1533 lastcell.faces[0] = pl->face;
1534 mask |= 0x1;
1535
1536 socket.send_faces (pl);
1537
1538 sl << uint16 (pl->face);
1539 }
1540 }
1541 else
1542 {
1543 /* Top face */
1544 if (update_space (sl, socket, m, nx, ny, ax, ay, 0))
1545 mask |= 0x1;
1546
1547 if (socket.EMI_smooth)
1548 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1549 emask |= 0x1;
1550 }
1551
1552 /* Check to see if we are in fact sending anything for this
1553 * space by checking the mask. If so, update the mask.
1554 * if not, reset the len to that from before adding the mask
1555 * value, so we don't send those bits.
1556 */
1557 if (mask & 0xf)
1558 sl[oldlen + 1] = mask & 0xff;
1559 else
1560 sl.reset (oldlen);
1561
1562 if (emask & 0xf)
1563 esl[eoldlen + 1] = emask & 0xff;
1564 else
1565 esl.reset (eoldlen);
1566 } /* else this is a viewable space */
1567 } /* for x loop */
1568 } /* for y loop */
1569
1570 /* Verify that we in fact do need to send this */
1571 if (socket.ext_mapinfos)
1572 {
1573 if (!(sl.length () > startlen || socket.sent_scroll))
1574 {
1575 /* No map data will follow, so don't say the client
1576 * it doesn't need draw!
1577 */
1578 ewhatflag &= ~EMI_NOREDRAW;
1579 esl[ewhatstart + 1] = ewhatflag & 0xff;
1580 }
1581
1582 if (esl.length () > estartlen)
1583 socket.send_packet (esl);
1584 }
1585
1586 if (sl.length () > startlen || socket.sent_scroll)
1587 {
1588 socket.send_packet (sl);
1589 socket.sent_scroll = 0;
1590 }
1591}
1592
1593/**
1594 * Draws client map.
1595 */
1596void
1597draw_client_map (object *pl)
1598{
1599 int i, j;
1600 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1601 int mflags;
1602 struct Map newmap;
1603 maptile *m, *pm;
1604
1605 if (pl->type != PLAYER)
1606 {
1607 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1608 return;
1609 }
1610
1611 pm = pl->map;
1612 901
1613 /* If player is just joining the game, he isn't here yet, so the map 902 /* If player is just joining the game, he isn't here yet, so the map
1614 * can get swapped out. If so, don't try to send them a map. All will 903 * can get swapped out. If so, don't try to send them a map. All will
1615 * be OK once they really log in. 904 * be OK once they really log in.
1616 */ 905 */
1617 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 906 if (!ob->map || ob->map->state != MAP_ACTIVE)
1618 return; 907 return;
1619 908
1620 memset (&newmap, 0, sizeof (struct Map)); 909 int startlen, oldlen;
1621 910
1622 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) 911 check_map_change (pl);
1623 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) 912 pl->ob->prefetch_surrounding_maps ();
913
914 /* do LOS after calls to update_position */
915 /* unfortunately, we need to udpate los when observing, currently */
916 if (pl->do_los || pl->viewpoint != pl->ob)
917 {
918 pl->do_los = 0;
919 pl->update_los ();
920 }
921
922 /**
923 * This function uses the new map1 protocol command to send the map
924 * to the client. It is necessary because the old map command supports
925 * a maximum map size of 15x15.
926 * This function is much simpler than the old one. This is because
927 * the old function optimized to send as few face identifiers as possible,
928 * at the expense of sending more coordinate location (coordinates were
929 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
930 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
931 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
932 * and use the other 4 bits for other informatiion. For full documentation
933 * of what we send, see the doc/Protocol file.
934 * I will describe internally what we do:
935 * the ns->lastmap shows how the map last looked when sent to the client.
936 * in the lastmap structure, there is a cells array, which is set to the
937 * maximum viewable size (As set in config.h).
938 * in the cells, there are faces and a count value.
939 * we use the count value to hold the darkness value. If -1, then this space
940 * is not viewable.
941 * we use faces[0] faces[1] faces[2] to hold what the three layers
942 * look like.
943 */
944
945 client &socket = *pl->ns;
946
947 packet sl ("map1a");
948
949 startlen = sl.length ();
950
951 int hx = socket.mapx / 2;
952 int hy = socket.mapy / 2;
953
954 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
955 int ax = dx + hx;
956 int ay = dy + hy;
957
958 int mask = (ax << 10) | (ay << 4);
959 MapCell &lastcell = socket.lastmap.cells[ax][ay];
960
961 /* If the coordinates are not valid, or it is too dark to see,
962 * we tell the client as such
963 */
964 if (!m)
1624 { 965 {
1625 ax = i; 966 /* space is out of map. Update space and clear values
1626 ay = j; 967 * if this hasn't already been done. If the space is out
1627 m = pm; 968 * of the map, it shouldn't have a head.
1628 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1629
1630 if (mflags & P_OUT_OF_MAP)
1631 continue;
1632
1633 /* If a map is visible to the player, we don't want to swap it out
1634 * just to reload it. This should really call something like
1635 * swap_map, but this is much more efficient and 'good enough'
1636 */ 969 */
1637 if (mflags & P_NEW_MAP) 970 if (lastcell.count != -1)
1638 m->timeout = 50; 971 {
972 sl << uint16 (mask);
973 map_clearcell (&lastcell, -1);
974 }
975
976 continue;
1639 } 977 }
1640 978
1641 /* do LOS after calls to update_position */ 979 int d = pl->blocked_los_uc (dx, dy);
1642 if (pl->contr->do_los) 980
981 if (d > 3)
1643 { 982 {
1644 update_los (pl); 983 /* This block deals with spaces that are not visible for whatever
1645 pl->contr->do_los = 0; 984 * reason. Still may need to send the head for this space.
985 */
986 if (lastcell.count != -1
987 || lastcell.faces[0]
988 || lastcell.faces[1]
989 || lastcell.faces[2]
990 || lastcell.stat_hp
991 || lastcell.flags
992 || lastcell.player)
993 sl << uint16 (mask);
994
995 /* properly clear a previously sent big face */
996 map_clearcell (&lastcell, -1);
1646 } 997 }
1647 998 else
1648 /* Big maps need a different drawing mechanism to work */
1649 draw_client_map1 (pl);
1650}
1651
1652
1653/*****************************************************************************/
1654
1655/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1656
1657/* a player. Of course, the client need to know the command to be able to */
1658
1659/* manage it ! */
1660
1661/*****************************************************************************/
1662void
1663send_plugin_custom_message (object *pl, char *buf)
1664{
1665 pl->contr->ns->send_packet (buf);
1666}
1667
1668/**
1669 * This sends the skill number to name mapping. We ignore
1670 * the params - we always send the same info no matter what.
1671 */
1672void
1673send_skill_info (client *ns, char *params)
1674{
1675 packet sl;
1676 sl << "replyinfo skill_info\n";
1677
1678 for (int i = 1; i < NUM_SKILLS; i++)
1679 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1680
1681 if (sl.length () >= MAXSOCKBUF)
1682 { 999 {
1683 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1000 /* In this block, the space is visible.
1684 fatal (0); 1001 */
1002
1003 /* Rather than try to figure out what everything that we might
1004 * need to send is, then form the packet after that,
1005 * we presume that we will in fact form a packet, and update
1006 * the bits by what we do actually send. If we send nothing,
1007 * we just back out sl.length () to the old value, and no harm
1008 * is done.
1009 * I think this is simpler than doing a bunch of checks to see
1010 * what if anything we need to send, setting the bits, then
1011 * doing those checks again to add the real data.
1012 */
1013 oldlen = sl.length ();
1014
1015 sl << uint16 (mask);
1016
1017 unsigned char dummy;
1018 unsigned char *last_ext = &dummy;
1019
1020 /* Darkness changed */
1021 if (lastcell.count != d)
1022 {
1023 mask |= 0x8;
1024
1025 *last_ext |= 0x80;
1026 last_ext = &sl[sl.length ()];
1027 sl << uint8 (d);
1028 }
1029
1030 lastcell.count = d;
1031
1032 mapspace &ms = m->at (nx, ny);
1033 ms.update ();
1034
1035 // extmap handling
1036 uint8 stat_hp = 0;
1037 uint8 stat_width = 0;
1038 uint8 flags = 0;
1039 tag_t player = 0;
1040
1041 // send hp information, if applicable
1042 if (object *op = ms.faces_obj [0])
1043 if (op->is_head () && !op->invisible)
1044 {
1045 if (op->stats.maxhp > op->stats.hp
1046 && op->stats.maxhp > 0
1047 && (op->type == PLAYER
1048 || op->type == DOOR // does not work, have maxhp 0
1049 || op->flag [FLAG_MONSTER]
1050 || op->flag [FLAG_ALIVE]
1051 || op->flag [FLAG_GENERATOR]))
1052 {
1053 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1054 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1055 }
1056
1057 if (expect_false (op->has_dialogue ()))
1058 flags |= 1;
1059
1060 if (expect_false (op->type == PLAYER))
1061 player = op == ob ? pl->ob->count
1062 : op == pl->ob ? ob->count
1063 : op->count;
1064 }
1065
1066 if (expect_false (lastcell.stat_hp != stat_hp))
1067 {
1068 lastcell.stat_hp = stat_hp;
1069
1070 mask |= 0x8;
1071 *last_ext |= 0x80;
1072 last_ext = &sl[sl.length ()];
1073
1074 sl << uint8 (5) << uint8 (stat_hp);
1075
1076 if (stat_width > 1)
1077 {
1078 *last_ext |= 0x80;
1079 last_ext = &sl[sl.length ()];
1080
1081 sl << uint8 (6) << uint8 (stat_width);
1082 }
1083 }
1084
1085 if (expect_false (lastcell.player != player))
1086 {
1087 lastcell.player = player;
1088
1089 mask |= 0x8;
1090 *last_ext |= 0x80;
1091 last_ext = &sl[sl.length ()];
1092
1093 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1094 }
1095
1096 if (expect_false (lastcell.flags != flags))
1097 {
1098 lastcell.flags = flags;
1099
1100 mask |= 0x8;
1101 *last_ext |= 0x80;
1102 last_ext = &sl[sl.length ()];
1103
1104 sl << uint8 (8) << uint8 (flags);
1105 }
1106
1107 // faces
1108
1109 /* Floor face */
1110 if (update_space (sl, socket, ms, lastcell, 2))
1111 mask |= 0x4;
1112
1113 /* Middle face */
1114 if (update_space (sl, socket, ms, lastcell, 1))
1115 mask |= 0x2;
1116
1117 if (expect_false (ob->invisible)
1118 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1119 && ms.player () == ob)
1120 {
1121 // force player to be visible to himself if invisible
1122 if (lastcell.faces[0] != ob->face)
1123 {
1124 lastcell.faces[0] = ob->face;
1125
1126 mask |= 0x1;
1127 sl << uint16 (ob->face);
1128
1129 socket.send_faces (ob);
1130 }
1131 }
1132 /* Top face */
1133 else if (update_space (sl, socket, ms, lastcell, 0))
1134 mask |= 0x1;
1135
1136 /* Check to see if we are in fact sending anything for this
1137 * space by checking the mask. If so, update the mask.
1138 * if not, reset the len to that from before adding the mask
1139 * value, so we don't send those bits.
1140 */
1141 if (mask & 0xf)
1142 sl[oldlen + 1] = mask & 0xff;
1143 else
1144 sl.reset (oldlen);
1145 } /* else this is a viewable space */
1146 ordered_mapwalk_end
1147
1148 socket.flush_fx ();
1149
1150 if (sl.length () > startlen || socket.sent_scroll)
1685 } 1151 {
1686
1687 ns->send_packet (sl); 1152 socket.send_packet (sl);
1688} 1153 socket.sent_scroll = 0;
1689
1690/**
1691 * This sends the spell path to name mapping. We ignore
1692 * the params - we always send the same info no matter what.
1693 */
1694void
1695send_spell_paths (client * ns, char *params)
1696{
1697 packet sl;
1698
1699 sl << "replyinfo spell_paths\n";
1700
1701 for (int i = 0; i < NRSPELLPATHS; i++)
1702 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1703
1704 if (sl.length () >= MAXSOCKBUF)
1705 { 1154 }
1706 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1707 fatal (0);
1708 }
1709
1710 ns->send_packet (sl);
1711} 1155}
1712 1156
1713/** 1157/**
1714 * This looks for any spells the player may have that have changed their stats. 1158 * This looks for any spells the player may have that have changed their stats.
1715 * it then sends an updspell packet for each spell that has changed in this way 1159 * it then sends an updspell packet for each spell that has changed in this way
… …
1718esrv_update_spells (player *pl) 1162esrv_update_spells (player *pl)
1719{ 1163{
1720 if (!pl->ns) 1164 if (!pl->ns)
1721 return; 1165 return;
1722 1166
1167 pl->ns->update_spells = false;
1168
1723 if (!pl->ns->monitor_spells) 1169 if (!pl->ns->monitor_spells)
1724 return; 1170 return;
1725 1171
1726 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1172 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1727 {
1728 if (spell->type == SPELL) 1173 if (spell->type == SPELL)
1729 { 1174 {
1730 int flags = 0; 1175 int flags = 0;
1176 int val;
1731 1177
1732 /* check if we need to update it */ 1178 /* check if we need to update it */
1733 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1179 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1180 if (spell->cached_sp != val)
1734 { 1181 {
1735 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1182 spell->cached_sp = val;
1736 flags |= UPD_SP_MANA; 1183 flags |= UPD_SP_MANA;
1737 } 1184 }
1738 1185
1739 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1186 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1187 if (spell->cached_grace != val)
1740 { 1188 {
1741 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1189 spell->cached_grace = val;
1742 flags |= UPD_SP_GRACE; 1190 flags |= UPD_SP_GRACE;
1743 } 1191 }
1744 1192
1745 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1193 val = casting_level (pl->ob, spell);
1194 if (spell->cached_eat != val)
1746 { 1195 {
1747 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1196 spell->cached_eat = val;
1748 flags |= UPD_SP_DAMAGE; 1197 flags |= UPD_SP_LEVEL;
1749 } 1198 }
1750 1199
1751 if (flags) 1200 if (flags)
1752 { 1201 {
1753 packet sl; 1202 packet sl;
1754 1203
1755 sl << "updspell " 1204 sl << "updspell "
1756 << uint8 (flags) 1205 << uint8 (flags)
1757 << uint32 (spell->count); 1206 << uint32 (spell->count);
1758 1207
1759 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1208 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1760 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1209 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1761 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1210 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1762 1211
1763 pl->ns->send_packet (sl); 1212 pl->ns->send_packet (sl);
1764 } 1213 }
1765 } 1214 }
1766 }
1767} 1215}
1768 1216
1769void 1217void
1770esrv_remove_spell (player *pl, object *spell) 1218esrv_remove_spell (player *pl, object *spell)
1771{ 1219{
… …
1787 1235
1788/* appends the spell *spell to the Socklist we will send the data to. */ 1236/* appends the spell *spell to the Socklist we will send the data to. */
1789static void 1237static void
1790append_spell (player *pl, packet &sl, object *spell) 1238append_spell (player *pl, packet &sl, object *spell)
1791{ 1239{
1792 int i, skill = 0; 1240 int skill = 0;
1793 1241
1794 if (!(spell->name)) 1242 if (!(spell->name))
1795 { 1243 {
1796 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1244 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1797 return; 1245 return;
1798 } 1246 }
1799 1247
1800 /* store costs and damage in the object struct, to compare to later */ 1248 /* store costs and damage in the object struct, to compare to later */
1801 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1249 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1802 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1250 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1803 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1251 spell->cached_eat = casting_level (pl->ob, spell);
1804 1252
1805 /* figure out which skill it uses, if it uses one */ 1253 /* figure out which skill it uses, if it uses one */
1806 if (spell->skill) 1254 if (spell->skill)
1807 { 1255 if (object *tmp = pl->find_skill (spell->skill))
1808 for (i = 1; i < NUM_SKILLS; i++) 1256 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1809 if (!strcmp (spell->skill, skill_names[i]))
1810 {
1811 skill = i + CS_STAT_SKILLINFO;
1812 break;
1813 }
1814 }
1815 1257
1816 // spells better have a face 1258 // spells better have a face
1817 if (!spell->face) 1259 if (!spell->face)
1818 { 1260 {
1819 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1261 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1820 spell->face = face_find ("burnout.x11", blank_face); 1262 spell->face = face_find ("burnout.x11", blank_face);
1821 } 1263 }
1264
1265 pl->ns->send_face (spell->face);
1822 1266
1823 /* send the current values */ 1267 /* send the current values */
1824 sl << uint32 (spell->count) 1268 sl << uint32 (spell->count)
1825 << uint16 (spell->level) 1269 << uint16 (spell->level)
1826 << uint16 (spell->casting_time) 1270 << uint16 (spell->casting_time)
1827 << uint16 (spell->last_sp) 1271 << uint16 (spell->cached_sp)
1828 << uint16 (spell->last_grace) 1272 << uint16 (spell->cached_grace)
1829 << uint16 (spell->last_eat) 1273 << uint16 (spell->cached_eat)
1830 << uint8 (skill) 1274 << uint8 (skill)
1831 << uint32 (spell->path_attuned) 1275 << uint32 (spell->path_attuned)
1832 << uint32 (spell->face) 1276 << uint32 (spell->face)
1833 << data8 (spell->name) 1277 << data8 (spell->name)
1834 << data16 (spell->msg); 1278 << data16 (spell->msg);
… …
1862 * bytes and 3 strings (because that is the spec) so we need to 1306 * bytes and 3 strings (because that is the spec) so we need to
1863 * check that the length of those 3 strings, plus the 23 bytes, 1307 * check that the length of those 3 strings, plus the 23 bytes,
1864 * won't take us over the length limit for the socket, if it does, 1308 * won't take us over the length limit for the socket, if it does,
1865 * we need to send what we already have, and restart packet formation 1309 * we need to send what we already have, and restart packet formation
1866 */ 1310 */
1311 if (spell->type != SPELL)
1312 continue;
1313
1867 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1314 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1868 * to show add_spell is 26 bytes + 2 strings. However, the overun 1315 * to show add_spell is 26 bytes + 2 strings. However, the overun
1869 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1316 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1870 * like it will fix this 1317 * like it will fix this
1871 */ 1318 */
1872 if (spell->type != SPELL)
1873 continue;
1874
1875 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1319 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1876 { 1320 {
1321 pl->ns->flush_fx ();
1877 pl->ns->send_packet (sl); 1322 pl->ns->send_packet (sl);
1878 1323
1879 sl.reset (); 1324 sl.reset ();
1880 sl << "addspell "; 1325 sl << "addspell ";
1881 } 1326 }
… …
1889 return; 1334 return;
1890 } 1335 }
1891 else 1336 else
1892 append_spell (pl, sl, spell); 1337 append_spell (pl, sl, spell);
1893 1338
1894 if (sl.length () >= MAXSOCKBUF) 1339 if (sl.length () > MAXSOCKBUF)
1895 {
1896 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1340 cleanup ("buffer overflow in esrv_add_spells!");
1897 fatal (0);
1898 }
1899 1341
1900 /* finally, we can send the packet */ 1342 /* finally, we can send the packet */
1343 pl->ns->flush_fx ();
1901 pl->ns->send_packet (sl); 1344 pl->ns->send_packet (sl);
1902} 1345}
1903 1346
1347//-GPL
1348

Diff Legend

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