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.170 by root, Thu Apr 8 20:05:36 2010 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 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 * 17 *
18 * 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
19 * 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
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * 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>
23 */ 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] = { CS_STAT_RES_PHYS,
70 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC, 71 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,
71 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID, 72 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,
72 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ , 73 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,
73 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 74 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,
74 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD, 75 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD,
… …
99 */ 100 */
100 mx = ns->mapx; 101 mx = ns->mapx;
101 my = ns->mapy; 102 my = ns->mapy;
102 103
103 /* the x and y here are coordinates for the new map, i.e. if we moved 104 /* 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, 105 * (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 106 * if the destination x or y coordinate is outside the viewable
106 * area, we clear the values - otherwise, the old values 107 * area, we clear the values - otherwise, the old values
107 * are preserved, and the check_head thinks it needs to clear them. 108 * are preserved, and the check_head thinks it needs to clear them.
108 */ 109 */
109 for (x = 0; x < mx; x++) 110 for (x = 0; x < mx; x++)
110 {
111 for (y = 0; y < my; y++) 111 for (y = 0; y < my; y++)
112 {
113 if (x >= ns->mapx || y >= ns->mapy) 112 if (x >= ns->mapx || y >= ns->mapy)
114 /* clear cells outside the viewable area */ 113 /* clear cells outside the viewable area */
115 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 114 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) 115 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 */ 116 /* clear newly visible tiles within the viewable area */
118 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 117 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
119 else 118 else
120 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 119 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
121 }
122 }
123 120
124 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 121 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
125 122
126 /* Make sure that the next "map1" command will be sent (even if it is 123 /* Make sure that the next "map1" command will be sent (even if it is
127 * empty). 124 * empty).
… …
130} 127}
131 128
132static void 129static void
133clear_map (player *pl) 130clear_map (player *pl)
134{ 131{
132 pl->ns->mapinfo_queue_clear ();
133
135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 134 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
135
136 pl->ns->force_newmap = false;
136 137
137 if (pl->ns->newmapcmd == 1) 138 if (pl->ns->newmapcmd == 1)
138 pl->ns->send_packet ("newmap"); 139 pl->ns->send_packet ("newmap");
139 140
140 pl->ns->floorbox_reset (); 141 pl->ns->floorbox_reset ();
142}
143
144static void
145send_map_info (player *pl)
146{
147 client &socket = *pl->ns;
148 object *ob = pl->viewpoint;
149
150 if (socket.mapinfocmd)
151 {
152 if (ob->map && ob->map->path[0])
153 {
154 int flags = 0;
155
156 if (ob->map->tile_path[0]) flags |= 1;
157 if (ob->map->tile_path[1]) flags |= 2;
158 if (ob->map->tile_path[2]) flags |= 4;
159 if (ob->map->tile_path[3]) flags |= 8;
160
161 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
162 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
163 ob->map->width, ob->map->height, &ob->map->path);
164 }
165 else
166 socket.send_packet ("mapinfo current");
167 }
141} 168}
142 169
143/** check for map/region change and send new map data */ 170/** check for map/region change and send new map data */
144static void 171static void
145check_map_change (player *pl) 172check_map_change (player *pl)
146{ 173{
147 client &socket = *pl->ns; 174 client &socket = *pl->ns;
148 object *ob = pl->ob; 175 object *ob = pl->viewpoint;
149 char buf[MAX_BUF]; /* eauugggh */
150 176
151 if (socket.current_map != ob->map) 177 region *reg = ob->region ();
178 if (socket.current_region != reg)
179 {
180 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
181 socket.current_region = reg;
152 { 182 }
183
184 // first try to aovid a full newmap on tiled map scrolls
185 if (socket.current_map != ob->map && !socket.force_newmap)
186 {
187 rv_vector rv;
188
189 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
190
191 // manhattan distance is very handy here
192 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
193 {
194 socket.current_map = ob->map;
195 socket.current_x = ob->x;
196 socket.current_y = ob->y;
197
198 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
199 socket.floorbox_reset ();
200 send_map_info (pl);
201 }
202 }
203
204 if (socket.current_map != ob->map || socket.force_newmap)
205 {
206 clear_map (pl);
153 socket.current_map = ob->map; 207 socket.current_map = ob->map;
154 208 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 } 209 }
181 else if (socket.current_x != ob->x || socket.current_y != ob->y) 210 else if (socket.current_x != ob->x || socket.current_y != ob->y)
182 { 211 {
183 int dx = ob->x - socket.current_x; 212 int dx = ob->x - socket.current_x;
184 int dy = ob->y - socket.current_y; 213 int dy = ob->y - socket.current_y;
185 214
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); 215 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
191 socket.floorbox_reset (); 216 socket.floorbox_reset ();
192 }
193 } 217 }
194 218
195 socket.current_x = ob->x; 219 socket.current_x = ob->x;
196 socket.current_y = ob->y; 220 socket.current_y = ob->y;
221}
197 222
198 region *reg = ob->region (); 223/**
199 if (socket.current_region != reg) 224 * This sends the skill number to name mapping. We ignore
200 { 225 * the params - we always send the same info no matter what.
201 socket.current_region = reg; 226 */
202 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname); 227static void
228send_skill_info (client *ns, char *params)
229{
230 packet sl;
231 sl << "replyinfo skill_info\n";
232
233 for (int i = 1; i < NUM_SKILLS; i++)
234 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
235
236 if (sl.length () > MAXSOCKBUF)
203 } 237 {
238 LOG (llevError, "Buffer overflow in send_skill_info!\n");
239 fatal (0);
240 }
241
242 ns->send_packet (sl);
243}
244
245/**
246 * This sends the spell path to name mapping. We ignore
247 * the params - we always send the same info no matter what.
248 */
249static void
250send_spell_paths (client * ns, char *params)
251{
252 packet sl;
253
254 sl << "replyinfo spell_paths\n";
255
256 for (int i = 0; i < NRSPELLPATHS; i++)
257 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
258
259 if (sl.length () > MAXSOCKBUF)
260 {
261 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
262 fatal (0);
263 }
264
265 ns->send_packet (sl);
204} 266}
205 267
206/** 268/**
207 * RequestInfo is sort of a meta command. There is some specific 269 * RequestInfo is sort of a meta command. There is some specific
208 * request of information, but we call other functions to provide 270 * request of information, but we call other functions to provide
209 * that information. 271 * that information.
210 */ 272 */
211void 273void
212RequestInfo (char *buf, int len, client * ns) 274RequestInfo (char *buf, int len, client *ns)
213{ 275{
214 char *params = NULL, *cp; 276 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 277
227 /* find the first space, make it null, and update the 278 /* find the first space, make it null, and update the
228 * params pointer. 279 * params pointer.
229 */ 280 */
230 for (cp = buf; *cp != '\0'; cp++) 281 for (params = buf; *params; params++)
231 if (*cp == ' ') 282 if (*params == ' ')
232 { 283 {
233 *cp = '\0';
234 params = cp + 1; 284 *params++ = 0;
235 break; 285 break;
236 } 286 }
237 287
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")) 288 if (!strcmp (buf, "skill_info"))
243 send_skill_info (ns, params); 289 send_skill_info (ns, params);
244 else if (!strcmp (buf, "spell_paths")) 290 else if (!strcmp (buf, "spell_paths"))
245 send_spell_paths (ns, params); 291 send_spell_paths (ns, params);
246 else 292 else
247 ns->send_packet (bigbuf, len); 293 {
294 // undo tokenisation above and send replyinfo with the request unchanged
295 if (*params)
296 *--params = ' ';
297
298 ns->send_packet_printf ("replyinfo %s", buf);
299 }
248} 300}
249 301
250void 302void
251ExtCmd (char *buf, int len, player *pl) 303ExtCmd (char *buf, int len, player *pl)
252{ 304{
… …
255 307
256void 308void
257ExtiCmd (char *buf, int len, client *ns) 309ExtiCmd (char *buf, int len, client *ns)
258{ 310{
259 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 311 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
312}
313
314//-GPL
315
316void
317client::mapinfo_queue_clear ()
318{
319 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
320 free (*i);
321
322 mapinfo_queue.clear ();
323}
324
325bool
326client::mapinfo_try (char *buf)
327{
328 char *token = buf;
329 buf += strlen (buf) + 9;
330
331 // initial map and its origin
332 maptile *map = pl->viewpoint->map;
333 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
334 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
335 int max_distance = 8; // limit maximum path length to something generous
336
337 while (*buf && map && max_distance)
338 {
339 int dir = *buf++ - '1';
340
341 if (dir >= 0 && dir <= 3)
342 {
343 if (!map->tile_path [dir])
344 map = 0;
345 else if (map->tile_available (dir, false))
346 {
347 maptile *neigh = map->tile_map [dir];
348
349 switch (dir)
350 {
351 case 0: mapy -= neigh->height; break;
352 case 2: mapy += map ->height; break;
353 case 3: mapx -= neigh->width ; break;
354 case 1: mapx += map ->width ; break;
355 }
356
357 map = neigh;
358 --max_distance;
359 }
360 else
361 return 0;
362 }
363 else
364 max_distance = 0;
365 }
366
367 if (!max_distance)
368 send_packet_printf ("mapinfo %s error", token);
369 else if (!map || !map->path)
370 send_packet_printf ("mapinfo %s nomap", token);
371 else
372 {
373 int flags = 0;
374
375 if (map->tile_path[0]) flags |= 1;
376 if (map->tile_path[1]) flags |= 2;
377 if (map->tile_path[2]) flags |= 4;
378 if (map->tile_path[3]) flags |= 8;
379
380 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
381 }
382
383 return 1;
384}
385
386void
387client::mapinfo_queue_run ()
388{
389 if (mapinfo_queue.empty () || !pl)
390 return;
391
392 for (int i = 0; i < mapinfo_queue.size (); ++i)
393 if (mapinfo_try (mapinfo_queue [i]))
394 {
395 free (mapinfo_queue [i]);
396 mapinfo_queue.erase (i);
397 }
398 else
399 ++i;
260} 400}
261 401
262void 402void
263MapInfoCmd (char *buf, int len, player *pl) 403MapInfoCmd (char *buf, int len, player *pl)
264{ 404{
265 // <mapinfo tag spatial tile-path 405 // <mapinfo tag spatial tile-path
266 // >mapinfo tag spatial flags x y w h hash 406 // >mapinfo tag spatial flags x y w h hash
267 407
268 char bigbuf[MAX_BUF], *token;
269
270 token = buf; 408 char *token = buf;
271 // copy token 409
272 if (!(buf = strchr (buf, ' '))) 410 if (!(buf = strchr (buf, ' ')))
273 return; 411 return;
274 412
275 *buf++ = 0;
276
277 if (!strncmp (buf, "spatial ", 8)) 413 if (!strncmp (buf, " spatial ", 9))
278 { 414 {
279 buf += 8; 415 char *copy = strdup (token);
416 copy [buf - token] = 0;
280 417
281 // initial map and its origin 418#if 0
282 maptile *map = pl->ob->map; 419 // this makes only sense when we flush the buffer immediately
283 sint16 dx, dy; 420 if (pl->ns->mapinfo_try (copy))
284 int mapx = pl->ns->mapx / 2 - pl->ob->x; 421 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 422 else
341 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 423#endif
424 pl->ns->mapinfo_queue.push_back (copy);
342 } 425 }
343 else 426 else
344 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 427 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
345
346 pl->ns->send_packet (bigbuf);
347} 428}
348 429
349/** This is the Setup cmd - easy first implementation */ 430/** This is the Setup cmd */
350void 431void
351SetUp (char *buf, int len, client * ns) 432SetUp (char *buf, int len, client * ns)
352{ 433{
353 int s, slen; 434 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} 435}
558 436
559/** 437/**
560 * The client has requested to be added to the game. 438 * 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. 439 * 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, 440 * 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. 441 * it either has to be here or init_sockets needs to be exported.
564 */ 442 */
565void 443void
566AddMeCmd (char *buf, int len, client * ns) 444AddMeCmd (char *buf, int len, client *ns)
567{ 445{
568 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 446 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
569} 447}
570 448
571/** Reply to ExtendedInfos command */ 449//+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 450
697/** 451/**
698 * This handles the general commands from the client (ie, north, fire, cast, 452 * This handles the general commands from the client (ie, north, fire, cast,
699 * etc.) 453 * etc.)
700 */ 454 */
… …
713 return; 467 return;
714 468
715 buf++; 469 buf++;
716 } 470 }
717 471
718 execute_newserver_command (pl->ob, (char *) buf); 472 execute_newserver_command (pl->ob, (char *)buf);
719 473
720 /* Perhaps something better should be done with a left over count. 474 /* Perhaps something better should be done with a left over count.
721 * Cleaning up the input should probably be done first - all actions 475 * 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 476 * for the command that issued the count should be done before any other
723 * commands. 477 * commands.
724 */ 478 */
725 pl->count = 0; 479 pl->count = 0;
726} 480}
727 481
728
729/** 482/**
730 * This handles the general commands from the client (ie, north, fire, cast, 483 * 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 484 * 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 485 * 'ncom' method which gives more information back to the client so it
733 * can throttle. 486 * can throttle.
… …
735void 488void
736NewPlayerCmd (char *buf, int len, player *pl) 489NewPlayerCmd (char *buf, int len, player *pl)
737{ 490{
738 if (len <= 6) 491 if (len <= 6)
739 { 492 {
740 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 493 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
741 return; 494 return;
742 } 495 }
743 496
744 uint16 cmdid = net_uint16 ((uint8 *)buf); 497 uint16 cmdid = net_uint16 ((uint8 *)buf);
745 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 498 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
758 * commands. 511 * commands.
759 */ 512 */
760 pl->count = 0; 513 pl->count = 0;
761 514
762 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 515 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
763 int time = fabs (pl->ob->speed) < 0.001 516 int time = pl->ob->has_active_speed ()
764 ? time = MAX_TIME * 100
765 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 517 ? (int) (MAX_TIME / pl->ob->speed)
518 : MAX_TIME * 100;
766 519
767 /* Send confirmation of command execution now */ 520 /* Send confirmation of command execution now */
768 packet sl ("comc"); 521 packet sl ("comc");
769 sl << uint16 (cmdid) << uint32 (time); 522 sl << uint16 (cmdid) << uint32 (time);
770 pl->ns->send_packet (sl); 523 pl->ns->send_packet (sl);
… …
802 { 555 {
803 case ST_PLAYING: 556 case ST_PLAYING:
804 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 557 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
805 break; 558 break;
806 559
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 */ 560 case ST_GET_PARTY_PASSWORD: /* Get password for party */
812 receive_party_password (pl->ob, 13); 561 receive_party_password (pl->ob, 13);
813 break; 562 break;
814 563
815 default: 564 default:
816 LOG (llevError, "Unknown input state: %d\n", ns->state); 565 LOG (llevError, "Unknown input state: %d\n", ns->state);
817 } 566 }
818} 567}
819 568
820/** 569/**
821 * Client tells its version. If there is a mismatch, we close the 570 * 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 */ 571 */
827void 572void
828VersionCmd (char *buf, int len, client * ns) 573VersionCmd (char *buf, int len, client *ns)
829{ 574{
830 if (!buf) 575 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} 576}
866 577
867/** sound related functions. */ 578/** sound related functions. */
868void 579void
869SetSound (char *buf, int len, client * ns) 580SetSound (char *buf, int len, client * ns)
… …
887 * syntax is: move (to) (tag) (nrof) 598 * syntax is: move (to) (tag) (nrof)
888 */ 599 */
889void 600void
890MoveCmd (char *buf, int len, player *pl) 601MoveCmd (char *buf, int len, player *pl)
891{ 602{
892 int vals[3], i; 603 int to, tag, nrof;
893 604
894 /* A little funky here. We only cycle for 2 records, because 605 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 { 606 {
901 vals[i] = atoi (buf);
902
903 if (!(buf = strchr (buf, ' ')))
904 {
905 LOG (llevError, "Incomplete move command: %s\n", buf); 607 LOG (llevError, "Incomplete move command: %s\n", buf);
906 return; 608 return;
907 }
908
909 buf++;
910 } 609 }
911 610
912 vals[2] = atoi (buf); 611 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} 612}
917 613
918/****************************************************************************** 614/******************************************************************************
919 * 615 *
920 * Start of commands the server sends to the client. 616 * Start of commands the server sends to the client.
… …
924/** 620/**
925 * Asks the client to query the user. This way, the client knows 621 * 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) 622 * it needs to send something back (vs just printing out a message)
927 */ 623 */
928void 624void
929send_query (client *ns, uint8 flags, char *text) 625send_query (client *ns, uint8 flags, const char *text)
930{ 626{
931 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 627 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
628}
629
630/**
631 * Get player's current range attack in obuf.
632 */
633static void
634rangetostring (player *pl, char *obuf)
635{
636 dynbuf_text &buf = msg_dynbuf; buf.clear ();
637
638#if 0
639 // print ranged/chosen_skill etc. objects every call
640 printf ("%s %s => %s (%s)\n",
641 pl->ranged_ob ? &pl->ranged_ob->name : "-",
642 pl->combat_ob ? &pl->combat_ob->name : "-",
643 pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
644 pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
645 );
646#endif
647
648 if (pl->ranged_ob)
649 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
650
651 if (pl->combat_ob)
652 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
653
654#if 0
655 //TODO: remove this when slot system is working, this is only for debugging
656 if (pl->ob->chosen_skill)
657 buf << " Skill*: " << pl->ob->chosen_skill->name;
658#endif
659
660 //TODO: maybe golem should become the current_weapon, quite simply?
661 if (pl->golem)
662 buf << " Golem*: " << pl->golem->name;
663
664 buf << '\0';
665 buf.linearise (obuf);
932} 666}
933 667
934#define AddIfInt64(Old,New,Type) if (Old != New) {\ 668#define AddIfInt64(Old,New,Type) if (Old != New) {\
935 Old = New; \ 669 Old = New; \
936 sl << uint8 (Type) << uint64 (New); \ 670 sl << uint8 (Type) << uint64 (New); \
… …
944#define AddIfShort(Old,New,Type) if (Old != New) {\ 678#define AddIfShort(Old,New,Type) if (Old != New) {\
945 Old = New; \ 679 Old = New; \
946 sl << uint8 (Type) << uint16 (New); \ 680 sl << uint8 (Type) << uint16 (New); \
947 } 681 }
948 682
949#define AddIfFloat(Old,New,Type) if (Old != New) {\ 683#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
950 Old = New; \ 684 Old = New; \
951 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 685 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
952 } 686 }
953 687
954#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 688#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
955 free(Old); Old = strdup (New);\ 689 free(Old); Old = strdup (New);\
956 sl << uint8 (Type) << data8 (New); \ 690 sl << uint8 (Type) << data8 (New); \
… …
970 704
971 client *ns = pl->ns; 705 client *ns = pl->ns;
972 if (!ns) 706 if (!ns)
973 return; 707 return;
974 708
975 object *ob = pl->ob; 709 object *ob = pl->observe;
976 if (!ob) 710 if (!ob)
977 return; 711 return;
712
713 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
978 714
979 packet sl ("stats"); 715 packet sl ("stats");
980 716
981 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 717 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
982 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 718 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
991 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 727 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
992 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 728 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
993 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 729 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
994 730
995 for (int s = 0; s < NUM_SKILLS; s++) 731 for (int s = 0; s < NUM_SKILLS; s++)
996 if (object *skill = pl->last_skill_ob[s]) 732 if (object *skill = opl->last_skill_ob [s])
997 if (skill->stats.exp != ns->last_skill_exp [s]) 733 if (skill->stats.exp != ns->last_skill_exp [s])
998 { 734 {
999 ns->last_skill_exp [s] = skill->stats.exp; 735 ns->last_skill_exp [s] = skill->stats.exp;
1000 736
1001 /* Always send along the level if exp changes. This is only 737 /* Always send along the level if exp changes. This is only
… …
1009 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 745 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1010 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 746 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1011 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 747 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1012 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 748 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1013 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 749 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1014 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 750 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
1015 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 751 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1016 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 752 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); 753 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1018 754
1019 flags = 0; 755 flags = 0;
1020 756
1021 if (pl->fire_on) 757 if (opl->fire_on)
1022 flags |= SF_FIREON; 758 flags |= SF_FIREON;
1023 759
1024 if (pl->run_on) 760 if (opl->run_on)
1025 flags |= SF_RUNON; 761 flags |= SF_RUNON;
1026 762
1027 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 763 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1028 764
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++) 765 for (int i = 0; i < NROFATTACKS; i++)
1033 { 766 {
1034 /* Skip ones we won't send */ 767 /* Skip ones we won't send */
1035 if (atnr_cs_stat[i] == -1) 768 if (atnr_cs_stat[i] == -1)
1036 continue; 769 continue;
1037 770
1038 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 771 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1039 } 772 }
1040 773
1041 if (pl->ns->monitor_spells) 774 if (pl->ns->monitor_spells)
1042 { 775 {
1043 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 776 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); 777 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); 778 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1046 } 779 }
1047 780
1048 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 781 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
1049 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 782 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1050 set_title (ob, buf); 783 set_title (ob, buf);
1051 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 784 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1052 785
1053 /* Only send it away if we have some actual data */ 786 /* Only send it away if we have some actual data */
… …
1057 790
1058/** 791/**
1059 * Tells the client that here is a player it should start using. 792 * Tells the client that here is a player it should start using.
1060 */ 793 */
1061void 794void
1062esrv_new_player (player *pl, uint32 weight) 795esrv_new_player (player *pl)
1063{ 796{
797 sint32 weight = pl->ob->client_weight ();
798
1064 packet sl ("player"); 799 packet sl ("player");
1065 800
1066 sl << uint32 (pl->ob->count) 801 sl << uint32 (pl->ob->count)
1067 << uint32 (weight) 802 << uint32 (weight)
1068 << uint32 (pl->ob->face) 803 << uint32 (pl->ob->face)
1069 << data8 (pl->ob->name); 804 << data8 (pl->ob->name);
1070 805
1071 pl->ns->last_weight = weight; 806 pl->ns->last_weight = weight;
1072 pl->ns->send_packet (sl); 807 pl->ns->send_packet (sl);
1073 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1074} 808}
1075 809
1076/****************************************************************************** 810/******************************************************************************
1077 * 811 *
1078 * Start of map related commands. 812 * Start of map related commands.
… …
1081 815
1082/** Clears a map cell */ 816/** Clears a map cell */
1083static void 817static void
1084map_clearcell (struct MapCell *cell, int count) 818map_clearcell (struct MapCell *cell, int count)
1085{ 819{
1086 cell->faces[0] = 0; 820 cell->faces[0] = 0;
1087 cell->faces[1] = 0; 821 cell->faces[1] = 0;
1088 cell->faces[2] = 0; 822 cell->faces[2] = 0;
823 cell->smooth[0] = 0;
824 cell->smooth[1] = 0;
825 cell->smooth[2] = 0;
1089 cell->count = count; 826 cell->count = count;
1090 cell->stat_hp = 0; 827 cell->stat_hp = 0;
1091 cell->flags = 0; 828 cell->flags = 0;
1092 cell->player = 0; 829 cell->player = 0;
1093} 830}
1094 831
1095#define MAX_LAYERS 3 832#define MAX_LAYERS 3
1096 833
1097/** 834/**
… …
1100 * it was. 837 * it was.
1101 * sl is the socklist this data is going into. 838 * sl is the socklist this data is going into.
1102 * ns is the socket we are working on - all the info we care 839 * 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 840 * about is in this socket structure, so now need not pass the
1104 * entire player object. 841 * 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 842 * 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) 843 * 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 844 * take. Interesting to note that before this function, the map1 function
1111 * numbers the spaces differently - I think this was a leftover from 845 * 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 846 * 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 847 * the case, it seems to make more sense to have these layer values
1114 * actually match. 848 * actually match.
1115 */ 849 */
1116static int 850static int
1117update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 851update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1118{ 852{
1119 uint16 face_num; 853 object *ob = ms.faces_obj [layer];
1120 int bx, by, i;
1121
1122 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1123 854
1124 /* If there is no object for this space, or if the face for the object 855 /* 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. 856 * is the blank face, set the face number to zero.
1126 * else if we have the stored head object for this space, that takes 857 * else if we have the stored head object for this space, that takes
1127 * precedence over the other object for this space. 858 * precedence over the other object for this space.
1128 * otherwise, we do special head processing 859 * otherwise, we do special head processing
1129 */ 860 */
1130 if (!ob || ob->face == blank_face) 861 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 862
1138 /* We've gotten what face we want to use for the object. Now see if 863 /* 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. 864 * if it has changed since we last sent it to the client.
1140 */ 865 */
1141 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 866 if (lastcell.faces[layer] != face_num)
1142 { 867 {
1143 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 868 lastcell.faces[layer] = face_num;
1144 869
1145 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 870 if (!ns.faces_sent[face_num])
1146 if (ob) 871 if (ob)
1147 ns.send_faces (ob); 872 ns.send_faces (ob);
1148 else 873 else
1149 ns.send_face (face_num); 874 ns.send_face (face_num, 10);
1150 875
1151 sl << uint16 (face_num); 876 sl << uint16 (face_num);
1152 return 1; 877 return 1;
1153 } 878 }
1154 879
1155 /* Nothing changed */ 880 /* Nothing changed */
1156 return 0; 881 return 0;
1157} 882}
1158 883
1159/** 884//-GPL
1160 * This function is mainly a copy of update_space,
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 */
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 885
1228// prefetch (and touch) all maps within a specific distancd 886// prefetch (and touch) all maps within a specific distancd
1229static void 887static void
1230prefetch_surrounding_maps (maptile *map, int distance) 888prefetch_surrounding_maps (maptile *map, int distance)
1231{ 889{
1232 map->last_access = runtime; 890 map->touch ();
1233 891
1234 if (--distance) 892 if (--distance)
1235 for (int dir = 4; --dir; ) 893 for (int dir = 4; dir--; )
1236 if (const shstr &path = map->tile_path [dir]) 894 if (const shstr &path = map->tile_path [dir])
1237 if (maptile *&neigh = map->tile_map [dir]) 895 if (maptile *&neigh = map->tile_map [dir])
1238 prefetch_surrounding_maps (neigh, distance); 896 prefetch_surrounding_maps (neigh, distance);
1239 else 897 else
1240 neigh = maptile::find_async (path, map); 898 neigh = maptile::find_async (path, map);
… …
1245prefetch_surrounding_maps (object *op) 903prefetch_surrounding_maps (object *op)
1246{ 904{
1247 prefetch_surrounding_maps (op->map, 3); 905 prefetch_surrounding_maps (op->map, 3);
1248} 906}
1249 907
908//+GPL
909
1250/** 910/**
1251 * This function uses the new map1 protocol command to send the map 911 * Draws client 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 */ 912 */
1272void 913void
1273draw_client_map1 (object *pl) 914draw_client_map (player *pl)
1274{ 915{
1275 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 916 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) 917 if (!pl->observe->active)
1286 return; 918 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 919
1613 /* If player is just joining the game, he isn't here yet, so the map 920 /* 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 921 * can get swapped out. If so, don't try to send them a map. All will
1615 * be OK once they really log in. 922 * be OK once they really log in.
1616 */ 923 */
1617 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 924 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1618 return; 925 return;
1619 926
1620 memset (&newmap, 0, sizeof (struct Map)); 927 int startlen, oldlen;
1621 928
1622 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) 929 check_map_change (pl);
1623 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) 930 prefetch_surrounding_maps (pl->ob);
931
932 /* do LOS after calls to update_position */
933 /* unfortunately, we need to udpate los when observing, currently */
934 if (pl->do_los || pl->viewpoint != pl->ob)
935 {
936 pl->do_los = 0;
937 pl->update_los ();
938 }
939
940 /**
941 * This function uses the new map1 protocol command to send the map
942 * to the client. It is necessary because the old map command supports
943 * a maximum map size of 15x15.
944 * This function is much simpler than the old one. This is because
945 * the old function optimized to send as few face identifiers as possible,
946 * at the expense of sending more coordinate location (coordinates were
947 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
948 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
949 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
950 * and use the other 4 bits for other informatiion. For full documentation
951 * of what we send, see the doc/Protocol file.
952 * I will describe internally what we do:
953 * the ns->lastmap shows how the map last looked when sent to the client.
954 * in the lastmap structure, there is a cells array, which is set to the
955 * maximum viewable size (As set in config.h).
956 * in the cells, there are faces and a count value.
957 * we use the count value to hold the darkness value. If -1, then this space
958 * is not viewable.
959 * we use faces[0] faces[1] faces[2] to hold what the three layers
960 * look like.
961 */
962
963 client &socket = *pl->ns;
964
965 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
966
967 startlen = sl.length ();
968
969 int hx = socket.mapx / 2;
970 int hy = socket.mapy / 2;
971
972 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
973 int ax = dx + hx;
974 int ay = dy + hy;
975
976 int mask = (ax << 10) | (ay << 4);
977 MapCell &lastcell = socket.lastmap.cells[ax][ay];
978
979 /* If the coordinates are not valid, or it is too dark to see,
980 * we tell the client as such
981 */
982 if (!m)
1624 { 983 {
1625 ax = i; 984 /* space is out of map. Update space and clear values
1626 ay = j; 985 * if this hasn't already been done. If the space is out
1627 m = pm; 986 * 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 */ 987 */
1637 if (mflags & P_NEW_MAP) 988 if (lastcell.count != -1)
1638 m->timeout = 50; 989 {
990 sl << uint16 (mask);
991 map_clearcell (&lastcell, -1);
992 }
993
994 continue;
1639 } 995 }
1640 996
1641 /* do LOS after calls to update_position */ 997 int d = pl->blocked_los_uc (dx, dy);
1642 if (pl->contr->do_los) 998
999 if (d > 3)
1643 { 1000 {
1644 update_los (pl); 1001 /* This block deals with spaces that are not visible for whatever
1645 pl->contr->do_los = 0; 1002 * reason. Still may need to send the head for this space.
1003 */
1004 if (lastcell.count != -1
1005 || lastcell.faces[0]
1006 || lastcell.faces[1]
1007 || lastcell.faces[2]
1008 || lastcell.stat_hp
1009 || lastcell.flags
1010 || lastcell.player)
1011 sl << uint16 (mask);
1012
1013 /* properly clear a previously sent big face */
1014 map_clearcell (&lastcell, -1);
1646 } 1015 }
1647 1016 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 { 1017 {
1683 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1018 /* In this block, the space is visible.
1684 fatal (0); 1019 */
1020
1021 /* Rather than try to figure out what everything that we might
1022 * need to send is, then form the packet after that,
1023 * we presume that we will in fact form a packet, and update
1024 * the bits by what we do actually send. If we send nothing,
1025 * we just back out sl.length () to the old value, and no harm
1026 * is done.
1027 * I think this is simpler than doing a bunch of checks to see
1028 * what if anything we need to send, setting the bits, then
1029 * doing those checks again to add the real data.
1030 */
1031 oldlen = sl.length ();
1032
1033 sl << uint16 (mask);
1034
1035 unsigned char dummy;
1036 unsigned char *last_ext = &dummy;
1037
1038 /* Darkness changed */
1039 if (lastcell.count != d)
1040 {
1041 mask |= 0x8;
1042
1043 *last_ext |= 0x80;
1044 last_ext = &sl[sl.length ()];
1045 sl << uint8 (d);
1046 }
1047
1048 lastcell.count = d;
1049
1050 mapspace &ms = m->at (nx, ny);
1051 ms.update ();
1052
1053 // extmap handling
1054 uint8 stat_hp = 0;
1055 uint8 stat_width = 0;
1056 uint8 flags = 0;
1057 tag_t player = 0;
1058
1059 // send hp information, if applicable
1060 if (object *op = ms.faces_obj [0])
1061 if (op->is_head () && !op->invisible)
1062 {
1063 if (op->stats.maxhp > op->stats.hp
1064 && op->stats.maxhp > 0
1065 && (op->type == PLAYER
1066 || op->type == DOOR // does not work, have maxhp 0
1067 || QUERY_FLAG (op, FLAG_MONSTER)
1068 || QUERY_FLAG (op, FLAG_ALIVE)
1069 || QUERY_FLAG (op, FLAG_GENERATOR)))
1070 {
1071 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1072 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1073 }
1074
1075 if (expect_false (op->has_dialogue ()))
1076 flags |= 1;
1077
1078 if (expect_false (op->type == PLAYER))
1079 player = op == ob ? pl->ob->count
1080 : op == pl->ob ? ob->count
1081 : op->count;
1082 }
1083
1084 if (expect_false (lastcell.stat_hp != stat_hp))
1085 {
1086 lastcell.stat_hp = stat_hp;
1087
1088 mask |= 0x8;
1089 *last_ext |= 0x80;
1090 last_ext = &sl[sl.length ()];
1091
1092 sl << uint8 (5) << uint8 (stat_hp);
1093
1094 if (stat_width > 1)
1095 {
1096 *last_ext |= 0x80;
1097 last_ext = &sl[sl.length ()];
1098
1099 sl << uint8 (6) << uint8 (stat_width);
1100 }
1101 }
1102
1103 if (expect_false (lastcell.player != player))
1104 {
1105 lastcell.player = player;
1106
1107 mask |= 0x8;
1108 *last_ext |= 0x80;
1109 last_ext = &sl[sl.length ()];
1110
1111 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1112 }
1113
1114 if (expect_false (lastcell.flags != flags))
1115 {
1116 lastcell.flags = flags;
1117
1118 mask |= 0x8;
1119 *last_ext |= 0x80;
1120 last_ext = &sl[sl.length ()];
1121
1122 sl << uint8 (8) << uint8 (flags);
1123 }
1124
1125 // faces
1126
1127 /* Floor face */
1128 if (update_space (sl, socket, ms, lastcell, 2))
1129 mask |= 0x4;
1130
1131 /* Middle face */
1132 if (update_space (sl, socket, ms, lastcell, 1))
1133 mask |= 0x2;
1134
1135 if (expect_false (ob->invisible)
1136 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1137 && ms.player () == ob)
1138 {
1139 // force player to be visible to himself if invisible
1140 if (lastcell.faces[0] != ob->face)
1141 {
1142 lastcell.faces[0] = ob->face;
1143
1144 mask |= 0x1;
1145 sl << uint16 (ob->face);
1146
1147 socket.send_faces (ob);
1148 }
1149 }
1150 /* Top face */
1151 else if (update_space (sl, socket, ms, lastcell, 0))
1152 mask |= 0x1;
1153
1154 /* Check to see if we are in fact sending anything for this
1155 * space by checking the mask. If so, update the mask.
1156 * if not, reset the len to that from before adding the mask
1157 * value, so we don't send those bits.
1158 */
1159 if (mask & 0xf)
1160 sl[oldlen + 1] = mask & 0xff;
1161 else
1162 sl.reset (oldlen);
1163 } /* else this is a viewable space */
1164 ordered_mapwalk_end
1165
1166 socket.flush_fx ();
1167
1168 if (sl.length () > startlen || socket.sent_scroll)
1685 } 1169 {
1686
1687 ns->send_packet (sl); 1170 socket.send_packet (sl);
1688} 1171 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 { 1172 }
1706 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1707 fatal (0);
1708 }
1709
1710 ns->send_packet (sl);
1711} 1173}
1712 1174
1713/** 1175/**
1714 * This looks for any spells the player may have that have changed their stats. 1176 * 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 1177 * it then sends an updspell packet for each spell that has changed in this way
… …
1718esrv_update_spells (player *pl) 1180esrv_update_spells (player *pl)
1719{ 1181{
1720 if (!pl->ns) 1182 if (!pl->ns)
1721 return; 1183 return;
1722 1184
1185 pl->ns->update_spells = false;
1186
1723 if (!pl->ns->monitor_spells) 1187 if (!pl->ns->monitor_spells)
1724 return; 1188 return;
1725 1189
1726 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1190 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1727 {
1728 if (spell->type == SPELL) 1191 if (spell->type == SPELL)
1729 { 1192 {
1730 int flags = 0; 1193 int flags = 0;
1194 int val;
1731 1195
1732 /* check if we need to update it */ 1196 /* check if we need to update it */
1733 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1197 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1198 if (spell->cached_sp != val)
1734 { 1199 {
1735 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1200 spell->cached_sp = val;
1736 flags |= UPD_SP_MANA; 1201 flags |= UPD_SP_MANA;
1737 } 1202 }
1738 1203
1739 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1204 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1205 if (spell->cached_grace != val)
1740 { 1206 {
1741 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1207 spell->cached_grace = val;
1742 flags |= UPD_SP_GRACE; 1208 flags |= UPD_SP_GRACE;
1743 } 1209 }
1744 1210
1745 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1211 val = casting_level (pl->ob, spell);
1212 if (spell->cached_eat != val)
1746 { 1213 {
1747 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1214 spell->cached_eat = val;
1748 flags |= UPD_SP_DAMAGE; 1215 flags |= UPD_SP_LEVEL;
1749 } 1216 }
1750 1217
1751 if (flags) 1218 if (flags)
1752 { 1219 {
1753 packet sl; 1220 packet sl;
1754 1221
1755 sl << "updspell " 1222 sl << "updspell "
1756 << uint8 (flags) 1223 << uint8 (flags)
1757 << uint32 (spell->count); 1224 << uint32 (spell->count);
1758 1225
1759 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1226 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1760 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1227 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1761 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1228 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1762 1229
1763 pl->ns->send_packet (sl); 1230 pl->ns->send_packet (sl);
1764 } 1231 }
1765 } 1232 }
1766 }
1767} 1233}
1768 1234
1769void 1235void
1770esrv_remove_spell (player *pl, object *spell) 1236esrv_remove_spell (player *pl, object *spell)
1771{ 1237{
… …
1796 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1262 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1797 return; 1263 return;
1798 } 1264 }
1799 1265
1800 /* store costs and damage in the object struct, to compare to later */ 1266 /* 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); 1267 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); 1268 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); 1269 spell->cached_eat = casting_level (pl->ob, spell);
1804 1270
1805 /* figure out which skill it uses, if it uses one */ 1271 /* figure out which skill it uses, if it uses one */
1806 if (spell->skill) 1272 if (spell->skill)
1807 { 1273 if (object *tmp = pl->find_skill (spell->skill))
1808 for (i = 1; i < NUM_SKILLS; i++)
1809 if (!strcmp (spell->skill, skill_names[i]))
1810 {
1811 skill = i + CS_STAT_SKILLINFO; 1274 skill = tmp->subtype + CS_STAT_SKILLINFO;
1812 break;
1813 }
1814 }
1815 1275
1816 // spells better have a face 1276 // spells better have a face
1817 if (!spell->face) 1277 if (!spell->face)
1818 { 1278 {
1819 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1279 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1820 spell->face = face_find ("burnout.x11", blank_face); 1280 spell->face = face_find ("burnout.x11", blank_face);
1821 } 1281 }
1282
1283 pl->ns->send_face (spell->face);
1822 1284
1823 /* send the current values */ 1285 /* send the current values */
1824 sl << uint32 (spell->count) 1286 sl << uint32 (spell->count)
1825 << uint16 (spell->level) 1287 << uint16 (spell->level)
1826 << uint16 (spell->casting_time) 1288 << uint16 (spell->casting_time)
1827 << uint16 (spell->last_sp) 1289 << uint16 (spell->cached_sp)
1828 << uint16 (spell->last_grace) 1290 << uint16 (spell->cached_grace)
1829 << uint16 (spell->last_eat) 1291 << uint16 (spell->cached_eat)
1830 << uint8 (skill) 1292 << uint8 (skill)
1831 << uint32 (spell->path_attuned) 1293 << uint32 (spell->path_attuned)
1832 << uint32 (spell->face) 1294 << uint32 (spell->face)
1833 << data8 (spell->name) 1295 << data8 (spell->name)
1834 << data16 (spell->msg); 1296 << data16 (spell->msg);
… …
1862 * bytes and 3 strings (because that is the spec) so we need to 1324 * 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, 1325 * 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, 1326 * 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 1327 * we need to send what we already have, and restart packet formation
1866 */ 1328 */
1329 if (spell->type != SPELL)
1330 continue;
1331
1867 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1332 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1868 * to show add_spell is 26 bytes + 2 strings. However, the overun 1333 * 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 1334 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1870 * like it will fix this 1335 * like it will fix this
1871 */ 1336 */
1872 if (spell->type != SPELL)
1873 continue;
1874
1875 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1337 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1876 { 1338 {
1339 pl->ns->flush_fx ();
1877 pl->ns->send_packet (sl); 1340 pl->ns->send_packet (sl);
1878 1341
1879 sl.reset (); 1342 sl.reset ();
1880 sl << "addspell "; 1343 sl << "addspell ";
1881 } 1344 }
… …
1889 return; 1352 return;
1890 } 1353 }
1891 else 1354 else
1892 append_spell (pl, sl, spell); 1355 append_spell (pl, sl, spell);
1893 1356
1894 if (sl.length () >= MAXSOCKBUF) 1357 if (sl.length () > MAXSOCKBUF)
1895 { 1358 {
1896 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1359 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1897 fatal (0); 1360 fatal (0);
1898 } 1361 }
1899 1362
1900 /* finally, we can send the packet */ 1363 /* finally, we can send the packet */
1364 pl->ns->flush_fx ();
1901 pl->ns->send_packet (sl); 1365 pl->ns->send_packet (sl);
1902} 1366}
1903 1367
1368//-GPL
1369

Diff Legend

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