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

Diff Legend

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