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.118 by root, Sun Jul 29 19:11:47 2007 UTC vs.
Revision 1.171 by root, Sun Apr 11 00:34:07 2010 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel 5 * Copyright (©) 2001 Mark Wedel
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT 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 3 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, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
24
25//+GPL
23 26
24/** 27/**
25 * \file 28 * \file
26 * Client handling. 29 * Client handling.
27 * 30 *
41 44
42#include <global.h> 45#include <global.h>
43#include <sproto.h> 46#include <sproto.h>
44 47
45#include <living.h> 48#include <living.h>
46#include <commands.h>
47 49
48/* 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,
49 * it should work here. 51 * it should work here.
50 */ 52 */
51#include <sys/types.h> 53#include <sys/types.h>
63 * This table translates the attack numbers as used within the 65 * This table translates the attack numbers as used within the
64 * 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
65 * 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
66 * client. 68 * client.
67 */ 69 */
68short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS, 70static short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,
69 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,
70 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,
71 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ , 73 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,
72 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 74 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,
73 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,
98 */ 100 */
99 mx = ns->mapx; 101 mx = ns->mapx;
100 my = ns->mapy; 102 my = ns->mapy;
101 103
102 /* 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
103 * (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,
104 * if the destination x or y coordinate is outside the viewable 106 * if the destination x or y coordinate is outside the viewable
105 * area, we clear the values - otherwise, the old values 107 * area, we clear the values - otherwise, the old values
106 * 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.
107 */ 109 */
108 for (x = 0; x < mx; x++) 110 for (x = 0; x < mx; x++)
109 {
110 for (y = 0; y < my; y++) 111 for (y = 0; y < my; y++)
111 {
112 if (x >= ns->mapx || y >= ns->mapy) 112 if (x >= ns->mapx || y >= ns->mapy)
113 /* clear cells outside the viewable area */ 113 /* clear cells outside the viewable area */
114 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 114 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
115 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)
116 /* clear newly visible tiles within the viewable area */ 116 /* clear newly visible tiles within the viewable area */
117 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 117 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
118 else 118 else
119 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));
120 }
121 }
122 120
123 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 121 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
124 122
125 /* 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
126 * empty). 124 * empty).
129} 127}
130 128
131static void 129static void
132clear_map (player *pl) 130clear_map (player *pl)
133{ 131{
132 pl->ns->mapinfo_queue_clear ();
133
134 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 134 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
135 135
136 pl->ns->force_newmap = false; 136 pl->ns->force_newmap = false;
137 137
138 if (pl->ns->newmapcmd == 1) 138 if (pl->ns->newmapcmd == 1)
139 pl->ns->send_packet ("newmap"); 139 pl->ns->send_packet ("newmap");
140 140
141 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 }
142} 168}
143 169
144/** check for map/region change and send new map data */ 170/** check for map/region change and send new map data */
145static void 171static void
146check_map_change (player *pl) 172check_map_change (player *pl)
147{ 173{
148 client &socket = *pl->ns; 174 client &socket = *pl->ns;
149 object *ob = pl->observe; 175 object *ob = pl->viewpoint;
176
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;
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 }
150 203
151 if (socket.current_map != ob->map || socket.force_newmap) 204 if (socket.current_map != ob->map || socket.force_newmap)
152 { 205 {
153 clear_map (pl); 206 clear_map (pl);
154 socket.current_map = ob->map; 207 socket.current_map = ob->map;
155 208 send_map_info (pl);
156 if (socket.mapinfocmd)
157 {
158 if (ob->map && ob->map->path[0])
159 {
160 int flags = 0;
161
162 if (ob->map->tile_path[0]) flags |= 1;
163 if (ob->map->tile_path[1]) flags |= 2;
164 if (ob->map->tile_path[2]) flags |= 4;
165 if (ob->map->tile_path[3]) flags |= 8;
166
167 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
168 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
169 ob->map->width, ob->map->height, &ob->map->path);
170 }
171 else
172 socket.send_packet ("mapinfo current");
173 }
174 } 209 }
175 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)
176 { 211 {
177 int dx = ob->x - socket.current_x; 212 int dx = ob->x - socket.current_x;
178 int dy = ob->y - socket.current_y; 213 int dy = ob->y - socket.current_y;
179 214
180 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
181 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
182 else
183 {
184 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);
185 socket.floorbox_reset (); 216 socket.floorbox_reset ();
186 }
187 } 217 }
188 218
189 socket.current_x = ob->x; 219 socket.current_x = ob->x;
190 socket.current_y = ob->y; 220 socket.current_y = ob->y;
221}
191 222
192 region *reg = ob->region (); 223/**
193 if (socket.current_region != reg) 224 * This sends the skill number to name mapping. We ignore
194 { 225 * the params - we always send the same info no matter what.
195 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region)); 226 */
196 socket.current_region = reg; 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)
197 } 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);
198} 266}
199 267
200/** 268/**
201 * RequestInfo is sort of a meta command. There is some specific 269 * RequestInfo is sort of a meta command. There is some specific
202 * request of information, but we call other functions to provide 270 * request of information, but we call other functions to provide
215 { 283 {
216 *params++ = 0; 284 *params++ = 0;
217 break; 285 break;
218 } 286 }
219 287
220 if (!strcmp (buf, "image_info"))
221 send_image_info (ns, params);
222 else if (!strcmp (buf, "image_sums"))
223 send_image_sums (ns, params);
224 else if (!strcmp (buf, "skill_info")) 288 if (!strcmp (buf, "skill_info"))
225 send_skill_info (ns, params); 289 send_skill_info (ns, params);
226 else if (!strcmp (buf, "spell_paths")) 290 else if (!strcmp (buf, "spell_paths"))
227 send_spell_paths (ns, params); 291 send_spell_paths (ns, params);
228 else 292 else
229 { 293 {
245ExtiCmd (char *buf, int len, client *ns) 309ExtiCmd (char *buf, int len, client *ns)
246{ 310{
247 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 311 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
248} 312}
249 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;
400}
401
250void 402void
251MapInfoCmd (char *buf, int len, player *pl) 403MapInfoCmd (char *buf, int len, player *pl)
252{ 404{
253 // <mapinfo tag spatial tile-path 405 // <mapinfo tag spatial tile-path
254 // >mapinfo tag spatial flags x y w h hash 406 // >mapinfo tag spatial flags x y w h hash
255 407
256 char bigbuf[MAX_BUF], *token;
257
258 token = buf; 408 char *token = buf;
259 // copy token 409
260 if (!(buf = strchr (buf, ' '))) 410 if (!(buf = strchr (buf, ' ')))
261 return; 411 return;
262 412
263 *buf++ = 0;
264
265 if (!strncmp (buf, "spatial ", 8)) 413 if (!strncmp (buf, " spatial ", 9))
266 { 414 {
267 buf += 8; 415 char *copy = strdup (token);
416 copy [buf - token] = 0;
268 417
269 // initial map and its origin 418#if 0
270 maptile *map = pl->ob->map; 419 // this makes only sense when we flush the buffer immediately
271 sint16 dx, dy; 420 if (pl->ns->mapinfo_try (copy))
272 int mapx = pl->ns->mapx / 2 - pl->ob->x; 421 free (copy);
273 int mapy = pl->ns->mapy / 2 - pl->ob->y;
274 int max_distance = 8; // limit maximum path length to something generous
275
276 while (*buf && map && max_distance)
277 {
278 int dir = *buf++;
279
280 switch (dir)
281 {
282 case '1':
283 dx = 0;
284 dy = -1;
285 map = map->xy_find (dx, dy);
286 map && (mapy -= map->height);
287 break;
288 case '2':
289 mapx += map->width;
290 dx = map->width;
291 dy = 0;
292 map = map->xy_find (dx, dy);
293 break;
294 case '3':
295 mapy += map->height;
296 dx = 0;
297 dy = map->height;
298 map = map->xy_find (dx, dy);
299 break;
300 case '4':
301 dx = -1;
302 dy = 0;
303 map = map->xy_find (dx, dy);
304 map && (mapx -= map->width);
305 break;
306 }
307
308 --max_distance;
309 }
310
311 if (!max_distance)
312 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
313 else if (map && map->path[0])
314 {
315 int flags = 0;
316
317 if (map->tile_path[0]) flags |= 1;
318 if (map->tile_path[1]) flags |= 2;
319 if (map->tile_path[2]) flags |= 4;
320 if (map->tile_path[3]) flags |= 8;
321
322 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
323 }
324 else 422 else
325 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 423#endif
424 pl->ns->mapinfo_queue.push_back (copy);
326 } 425 }
327 else 426 else
328 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 427 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
329
330 pl->ns->send_packet (bigbuf);
331} 428}
332 429
333/** This is the Setup cmd */ 430/** This is the Setup cmd */
334void 431void
335SetUp (char *buf, int len, client * ns) 432SetUp (char *buf, int len, client * ns)
347AddMeCmd (char *buf, int len, client *ns) 444AddMeCmd (char *buf, int len, client *ns)
348{ 445{
349 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 446 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
350} 447}
351 448
352/** Reply to ExtendedInfos command */ 449//+GPL
353void
354ToggleExtendedInfos (char *buf, int len, client * ns)
355{
356 char cmdback[MAX_BUF];
357 char command[50];
358 int info, nextinfo;
359
360 cmdback[0] = '\0';
361 nextinfo = 0;
362
363 while (1)
364 {
365 /* 1. Extract an info */
366 info = nextinfo;
367
368 while ((info < len) && (buf[info] == ' '))
369 info++;
370
371 if (info >= len)
372 break;
373
374 nextinfo = info + 1;
375
376 while ((nextinfo < len) && (buf[nextinfo] != ' '))
377 nextinfo++;
378
379 if (nextinfo - info >= 49) /*Erroneous info asked */
380 continue;
381
382 strncpy (command, &(buf[info]), nextinfo - info);
383
384 /* 2. Interpret info */
385 if (!strcmp ("smooth", command))
386 /* Toggle smoothing */
387 ns->EMI_smooth = !ns->EMI_smooth;
388 else
389 /*bad value */;
390
391 /*3. Next info */
392 }
393
394 strcpy (cmdback, "ExtendedInfoSet");
395
396 if (ns->EMI_smooth)
397 {
398 strcat (cmdback, " ");
399 strcat (cmdback, "smoothing");
400 }
401
402 ns->send_packet (cmdback);
403}
404
405/*
406#define MSG_TYPE_BOOK 1
407#define MSG_TYPE_CARD 2
408#define MSG_TYPE_PAPER 3
409#define MSG_TYPE_SIGN 4
410#define MSG_TYPE_MONUMENT 5
411#define MSG_TYPE_SCRIPTED_DIALOG 6*/
412
413/** Reply to ExtendedInfos command */
414void
415ToggleExtendedText (char *buf, int len, client * ns)
416{
417 char cmdback[MAX_BUF];
418 char temp[10];
419 char command[50];
420 int info, nextinfo, i, flag;
421
422 cmdback[0] = '\0';
423
424 nextinfo = 0;
425 while (1)
426 {
427 /* 1. Extract an info */
428 info = nextinfo;
429
430 while ((info < len) && (buf[info] == ' '))
431 info++;
432
433 if (info >= len)
434 break;
435
436 nextinfo = info + 1;
437
438 while ((nextinfo < len) && (buf[nextinfo] != ' '))
439 nextinfo++;
440
441 if (nextinfo - info >= 49) /*Erroneous info asked */
442 continue;
443
444 strncpy (command, &(buf[info]), nextinfo - info);
445 command[nextinfo - info] = '\0';
446 /* 2. Interpret info */
447 i = sscanf (command, "%d", &flag);
448
449 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
450 ns->supported_readables |= (1 << flag);
451 /*3. Next info */
452 }
453
454 /* Send resulting state */
455 strcpy (cmdback, "ExtendedTextSet");
456
457 for (i = 0; i <= MSG_TYPE_LAST; i++)
458 if (ns->supported_readables & (1 << i))
459 {
460 strcat (cmdback, " ");
461 snprintf (temp, sizeof (temp), "%d", i);
462 strcat (cmdback, temp);
463 }
464
465 ns->send_packet (cmdback);
466}
467 450
468/** 451/**
469 * 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,
470 * etc.) 453 * etc.)
471 */ 454 */
484 return; 467 return;
485 468
486 buf++; 469 buf++;
487 } 470 }
488 471
489 execute_newserver_command (pl->ob, (char *) buf); 472 execute_newserver_command (pl->ob, (char *)buf);
490 473
491 /* Perhaps something better should be done with a left over count. 474 /* Perhaps something better should be done with a left over count.
492 * Cleaning up the input should probably be done first - all actions 475 * Cleaning up the input should probably be done first - all actions
493 * 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
494 * commands. 477 * commands.
528 * commands. 511 * commands.
529 */ 512 */
530 pl->count = 0; 513 pl->count = 0;
531 514
532 //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
533 int time = fabs (pl->ob->speed) < 0.001 516 int time = pl->ob->has_active_speed ()
534 ? time = MAX_TIME * 100
535 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 517 ? (int) (MAX_TIME / pl->ob->speed)
518 : MAX_TIME * 100;
536 519
537 /* Send confirmation of command execution now */ 520 /* Send confirmation of command execution now */
538 packet sl ("comc"); 521 packet sl ("comc");
539 sl << uint16 (cmdid) << uint32 (time); 522 sl << uint16 (cmdid) << uint32 (time);
540 pl->ns->send_packet (sl); 523 pl->ns->send_packet (sl);
582 LOG (llevError, "Unknown input state: %d\n", ns->state); 565 LOG (llevError, "Unknown input state: %d\n", ns->state);
583 } 566 }
584} 567}
585 568
586/** 569/**
587 * Client tells its version. If there is a mismatch, we close the 570 * Client tells its version info.
588 * socket. In real life, all we should care about is the client having
589 * something older than the server. If we assume the client will be
590 * backwards compatible, having it be a later version should not be a
591 * problem.
592 */ 571 */
593void 572void
594VersionCmd (char *buf, int len, client * ns) 573VersionCmd (char *buf, int len, client *ns)
595{ 574{
596 if (!buf) 575 INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
597 {
598 LOG (llevError, "CS: received corrupted version command\n");
599 return;
600 }
601
602 ns->cs_version = atoi (buf);
603 ns->sc_version = ns->cs_version;
604
605 LOG (llevDebug, "connection from client <%s>\n", buf);
606
607 //TODO: should log here just for statistics
608
609 //if (VERSION_CS != ns->cs_version)
610 // unchecked;
611
612 char *cp = strchr (buf + 1, ' ');
613 if (!cp)
614 return;
615
616 ns->sc_version = atoi (cp);
617
618 //if (VERSION_SC != ns->sc_version)
619 // unchecked;
620
621 cp = strchr (cp + 1, ' ');
622
623 if (cp)
624 {
625 ns->version = cp + 1;
626
627 if (ns->sc_version < 1026)
628 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
629 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
630 }
631} 576}
632 577
633/** sound related functions. */ 578/** sound related functions. */
634void 579void
635SetSound (char *buf, int len, client * ns) 580SetSound (char *buf, int len, client * ns)
653 * syntax is: move (to) (tag) (nrof) 598 * syntax is: move (to) (tag) (nrof)
654 */ 599 */
655void 600void
656MoveCmd (char *buf, int len, player *pl) 601MoveCmd (char *buf, int len, player *pl)
657{ 602{
658 int vals[3], i; 603 int to, tag, nrof;
659 604
660 /* A little funky here. We only cycle for 2 records, because 605 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
661 * we obviously are not going to find a space after the third
662 * record. Perhaps we should just replace this with a
663 * sscanf?
664 */
665 for (i = 0; i < 2; i++)
666 { 606 {
667 vals[i] = atoi (buf);
668
669 if (!(buf = strchr (buf, ' ')))
670 {
671 LOG (llevError, "Incomplete move command: %s\n", buf); 607 LOG (llevError, "Incomplete move command: %s\n", buf);
672 return; 608 return;
673 }
674
675 buf++;
676 } 609 }
677 610
678 vals[2] = atoi (buf); 611 esrv_move_object (pl->ob, to, tag, nrof);
679
680/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
681 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
682} 612}
683 613
684/****************************************************************************** 614/******************************************************************************
685 * 615 *
686 * Start of commands the server sends to the client. 616 * Start of commands the server sends to the client.
701 * Get player's current range attack in obuf. 631 * Get player's current range attack in obuf.
702 */ 632 */
703static void 633static void
704rangetostring (player *pl, char *obuf) 634rangetostring (player *pl, char *obuf)
705{ 635{
706 dynbuf_text buf; 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
707 647
708 if (pl->ranged_ob) 648 if (pl->ranged_ob)
709 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 649 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
710 650
711 if (pl->combat_ob) 651 if (pl->combat_ob)
787 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 727 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
788 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 728 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
789 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 729 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
790 730
791 for (int s = 0; s < NUM_SKILLS; s++) 731 for (int s = 0; s < NUM_SKILLS; s++)
792 if (object *skill = opl->last_skill_ob[s]) 732 if (object *skill = opl->last_skill_ob [s])
793 if (skill->stats.exp != ns->last_skill_exp [s]) 733 if (skill->stats.exp != ns->last_skill_exp [s])
794 { 734 {
795 ns->last_skill_exp [s] = skill->stats.exp; 735 ns->last_skill_exp [s] = skill->stats.exp;
796 736
797 /* Always send along the level if exp changes. This is only 737 /* Always send along the level if exp changes. This is only
805 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 745 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
806 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 746 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
807 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 747 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
808 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 748 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
809 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 749 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
810 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK); 750 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
811 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 751 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
812 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); 752 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
813 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);
814 754
815 flags = 0; 755 flags = 0;
816 756
817 if (opl->fire_on) 757 if (opl->fire_on)
820 if (opl->run_on) 760 if (opl->run_on)
821 flags |= SF_RUNON; 761 flags |= SF_RUNON;
822 762
823 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 763 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
824 764
825 if (ns->sc_version < 1025)
826 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
827 else
828 for (int i = 0; i < NROFATTACKS; i++) 765 for (int i = 0; i < NROFATTACKS; i++)
829 { 766 {
830 /* Skip ones we won't send */ 767 /* Skip ones we won't send */
831 if (atnr_cs_stat[i] == -1) 768 if (atnr_cs_stat[i] == -1)
832 continue; 769 continue;
833 770
834 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]);
835 } 772 }
836 773
837 if (pl->ns->monitor_spells) 774 if (pl->ns->monitor_spells)
838 { 775 {
839 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);
840 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);
853 790
854/** 791/**
855 * 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.
856 */ 793 */
857void 794void
858esrv_new_player (player *pl, uint32 weight) 795esrv_new_player (player *pl)
859{ 796{
797 sint32 weight = pl->ob->client_weight ();
798
860 packet sl ("player"); 799 packet sl ("player");
861 800
862 sl << uint32 (pl->ob->count) 801 sl << uint32 (pl->ob->count)
863 << uint32 (weight) 802 << uint32 (weight)
864 << uint32 (pl->ob->face) 803 << uint32 (pl->ob->face)
865 << data8 (pl->ob->name); 804 << data8 (pl->ob->name);
866 805
867 pl->ns->last_weight = weight; 806 pl->ns->last_weight = weight;
868 pl->ns->send_packet (sl); 807 pl->ns->send_packet (sl);
869 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
870} 808}
871 809
872/****************************************************************************** 810/******************************************************************************
873 * 811 *
874 * Start of map related commands. 812 * Start of map related commands.
941 879
942 /* Nothing changed */ 880 /* Nothing changed */
943 return 0; 881 return 0;
944} 882}
945 883
946/** 884//-GPL
947 * Returns the size of a data for a map square as returned by
948 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
949 * available.
950 */
951int
952getExtendedMapInfoSize (client * ns)
953{
954 int result = 0;
955
956 if (ns->ext_mapinfos)
957 {
958 if (ns->EMI_smooth)
959 result += 1; /*One byte for smoothlevel */
960 }
961
962 return result;
963}
964 885
965// prefetch (and touch) all maps within a specific distancd 886// prefetch (and touch) all maps within a specific distancd
966static void 887static void
967prefetch_surrounding_maps (maptile *map, int distance) 888prefetch_surrounding_maps (maptile *map, int distance)
968{ 889{
969 map->last_access = runtime; 890 map->touch ();
970 891
971 if (--distance) 892 if (--distance)
972 for (int dir = 4; --dir; ) 893 for (int dir = 4; dir--; )
973 if (const shstr &path = map->tile_path [dir]) 894 if (const shstr &path = map->tile_path [dir])
974 if (maptile *&neigh = map->tile_map [dir]) 895 if (maptile *&neigh = map->tile_map [dir])
975 prefetch_surrounding_maps (neigh, distance); 896 prefetch_surrounding_maps (neigh, distance);
976 else 897 else
977 neigh = maptile::find_async (path, map); 898 neigh = maptile::find_async (path, map);
982prefetch_surrounding_maps (object *op) 903prefetch_surrounding_maps (object *op)
983{ 904{
984 prefetch_surrounding_maps (op->map, 3); 905 prefetch_surrounding_maps (op->map, 3);
985} 906}
986 907
908//+GPL
909
987/** 910/**
988 * Draws client map. 911 * Draws client map.
989 */ 912 */
990void 913void
991draw_client_map (player *pl) 914draw_client_map (player *pl)
992{ 915{
993 object *ob = pl->observe; 916 object *ob = pl->viewpoint;
994 if (!ob->active) 917 if (!pl->observe->active)
995 return; 918 return;
996
997 maptile *plmap = ob->map;
998 919
999 /* 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
1000 * 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
1001 * be OK once they really log in. 922 * be OK once they really log in.
1002 */ 923 */
1003 if (!plmap || plmap->in_memory != MAP_IN_MEMORY) 924 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1004 return; 925 return;
1005 926
1006 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1007 int estartlen, eoldlen; 927 int startlen, oldlen;
1008 uint8 eentrysize;
1009 uint16 ewhatstart, ewhatflag;
1010 uint8 extendedinfos;
1011 928
1012 check_map_change (pl); 929 check_map_change (pl);
1013 prefetch_surrounding_maps (pl->ob); 930 prefetch_surrounding_maps (pl->ob);
1014 931
1015 /* do LOS after calls to update_position */ 932 /* do LOS after calls to update_position */
1016 if (ob != pl->ob) 933 /* unfortunately, we need to udpate los when observing, currently */
1017 clear_los (pl); 934 if (pl->do_los || pl->viewpoint != pl->ob)
1018 else if (pl->do_los)
1019 { 935 {
1020 update_los (ob);
1021 pl->do_los = 0; 936 pl->do_los = 0;
937 pl->update_los ();
1022 } 938 }
1023 939
1024 /** 940 /**
1025 * This function uses the new map1 protocol command to send the map 941 * This function uses the new map1 protocol command to send the map
1026 * to the client. It is necessary because the old map command supports 942 * to the client. It is necessary because the old map command supports
1045 */ 961 */
1046 962
1047 client &socket = *pl->ns; 963 client &socket = *pl->ns;
1048 964
1049 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 965 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1050 packet esl;
1051 966
1052 startlen = sl.length (); 967 startlen = sl.length ();
1053 968
1054 /*Extendedmapinfo structure initialisation */ 969 int hx = socket.mapx / 2;
1055 if (socket.ext_mapinfos) 970 int hy = socket.mapy / 2;
1056 {
1057 extendedinfos = EMI_NOREDRAW;
1058 971
1059 if (socket.EMI_smooth) 972 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1060 extendedinfos |= EMI_SMOOTH; 973 int ax = dx + hx;
974 int ay = dy + hy;
1061 975
1062 ewhatstart = esl.length (); 976 int mask = (ax << 10) | (ay << 4);
1063 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 977 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1064 could need to be taken away */
1065 eentrysize = getExtendedMapInfoSize (&socket);
1066 esl << "mapextended "
1067 << uint8 (extendedinfos)
1068 << uint8 (eentrysize);
1069 978
1070 estartlen = esl.length (); 979 /* If the coordinates are not valid, or it is too dark to see,
1071 } 980 * we tell the client as such
1072
1073 /* x,y are the real map locations. ax, ay are viewport relative
1074 * locations.
1075 */ 981 */
1076 ay = 0; 982 if (!m)
1077
1078 /* We could do this logic as conditionals in the if statement,
1079 * but that started to get a bit messy to look at.
1080 */
1081 max_x = ob->x + (socket.mapx + 1) / 2;
1082 max_y = ob->y + (socket.mapy + 1) / 2;
1083
1084 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1085 { 983 {
1086 sint16 nx, ny; 984 /* space is out of map. Update space and clear values
1087 maptile *m = 0; 985 * if this hasn't already been done. If the space is out
1088 986 * of the map, it shouldn't have a head.
1089 ax = 0; 987 */
1090 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) 988 if (lastcell.count != -1)
1091 { 989 {
1092 // check to see if we can simply go one right quickly 990 sl << uint16 (mask);
991 map_clearcell (&lastcell, -1);
1093 ++nx; 992 }
1094 if (m && nx >= m->width) 993
994 continue;
995 }
996
997 int d = pl->blocked_los_uc (dx, dy);
998
999 if (d > 3)
1000 {
1001 /* This block deals with spaces that are not visible for whatever
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);
1015 }
1016 else
1017 {
1018 /* In this block, the space is visible.
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 {
1095 m = 0; 1041 mask |= 0x8;
1096 1042
1097 if (!m) 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)
1098 { 1062 {
1099 nx = x; ny = y; m = plmap; 1063 if (op->stats.maxhp > op->stats.hp
1100 1064 && op->stats.maxhp > 0
1101 if (!xy_normalise (m, nx, ny)) 1065 && (op->type == PLAYER
1066 || op->type == DOOR // does not work, have maxhp 0
1067 || op->flag [FLAG_MONSTER]
1068 || op->flag [FLAG_ALIVE]
1069 || op->flag [FLAG_GENERATOR]))
1102 m = 0; 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;
1103 } 1082 }
1104 1083
1105 int emask, mask; 1084 if (expect_false (lastcell.stat_hp != stat_hp))
1106 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1107
1108 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1109
1110 /* If the coordinates are not valid, or it is too dark to see,
1111 * we tell the client as such
1112 */
1113 if (!m)
1114 { 1085 {
1115 /* space is out of map. Update space and clear values 1086 lastcell.stat_hp = stat_hp;
1116 * if this hasn't already been done. If the space is out 1087
1117 * of the map, it shouldn't have a head 1088 mask |= 0x8;
1118 */ 1089 *last_ext |= 0x80;
1119 if (lastcell.count != -1) 1090 last_ext = &sl[sl.length ()];
1091
1092 sl << uint8 (5) << uint8 (stat_hp);
1093
1094 if (stat_width > 1)
1120 { 1095 {
1121 sl << uint16 (mask);
1122 map_clearcell (&lastcell, -1);
1123 }
1124
1125 continue;
1126 }
1127
1128 m->touch ();
1129
1130 int d = pl->blocked_los[ax][ay];
1131
1132 if (d > 3)
1133 {
1134
1135 int need_send = 0, count;
1136
1137 /* This block deals with spaces that are not visible for whatever
1138 * reason. Still may need to send the head for this space.
1139 */
1140
1141 oldlen = sl.length ();
1142
1143 sl << uint16 (mask);
1144
1145 if (lastcell.count != -1)
1146 need_send = 1;
1147
1148 count = -1;
1149
1150 /* properly clear a previously sent big face */
1151 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1152 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1153 need_send = 1;
1154
1155 map_clearcell (&lastcell, count);
1156
1157 if ((mask & 0xf) || need_send)
1158 sl[oldlen + 1] = mask & 0xff;
1159 else
1160 sl.reset (oldlen);
1161 }
1162 else
1163 {
1164 /* In this block, the space is visible.
1165 */
1166
1167 /* Rather than try to figure out what everything that we might
1168 * need to send is, then form the packet after that,
1169 * we presume that we will in fact form a packet, and update
1170 * the bits by what we do actually send. If we send nothing,
1171 * we just back out sl.length () to the old value, and no harm
1172 * is done.
1173 * I think this is simpler than doing a bunch of checks to see
1174 * what if anything we need to send, setting the bits, then
1175 * doing those checks again to add the real data.
1176 */
1177 oldlen = sl.length ();
1178 eoldlen = esl.length ();
1179
1180 sl << uint16 (mask);
1181
1182 unsigned char dummy;
1183 unsigned char *last_ext = &dummy;
1184
1185 /* Darkness changed */
1186 if (lastcell.count != d && socket.darkness)
1187 {
1188 mask |= 0x8;
1189
1190 if (socket.extmap)
1191 {
1192 *last_ext |= 0x80; 1096 *last_ext |= 0x80;
1193 last_ext = &sl[sl.length ()]; 1097 last_ext = &sl[sl.length ()];
1194 sl << uint8 (d); 1098
1195 } 1099 sl << uint8 (6) << uint8 (stat_width);
1196 else
1197 sl << uint8 (255 - 64 * d);
1198 } 1100 }
1101 }
1199 1102
1200 lastcell.count = d; 1103 if (expect_false (lastcell.player != player))
1201
1202 mapspace &ms = m->at (nx, ny);
1203 ms.update ();
1204
1205 if (socket.extmap)
1206 { 1104 {
1207 uint8 stat_hp = 0; 1105 lastcell.player = player;
1208 uint8 stat_width = 0;
1209 uint8 flags = 0;
1210 tag_t player = 0;
1211 1106
1212 // send hp information, if applicable
1213 if (object *op = ms.faces_obj [0])
1214 {
1215 if (op->head || op->invisible)
1216 ; // do not show
1217 else if (op->type == PLAYER
1218 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1219 {
1220 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1221 {
1222 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1223 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1224 }
1225 }
1226
1227 if (op->msg && op->msg[0] == '@')
1228 flags |= 1;
1229
1230 if (op->type == PLAYER && op != ob)
1231 player = op->count;
1232 }
1233
1234 if (lastcell.stat_hp != stat_hp)
1235 {
1236 lastcell.stat_hp = stat_hp;
1237
1238 mask |= 0x8; 1107 mask |= 0x8;
1239 *last_ext |= 0x80; 1108 *last_ext |= 0x80;
1240 last_ext = &sl[sl.length ()]; 1109 last_ext = &sl[sl.length ()];
1241 1110
1242 sl << uint8 (5) << uint8 (stat_hp);
1243
1244 if (stat_width > 1)
1245 {
1246 *last_ext |= 0x80;
1247 last_ext = &sl[sl.length ()];
1248
1249 sl << uint8 (6) << uint8 (stat_width);
1250 }
1251 }
1252
1253 if (lastcell.player != player)
1254 {
1255 lastcell.player = player;
1256
1257 mask |= 0x8;
1258 *last_ext |= 0x80;
1259 last_ext = &sl[sl.length ()];
1260
1261 sl << uint8 (0x47) << uint8 (4) << (uint32)player; 1111 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1262 } 1112 }
1263 1113
1264 if (lastcell.flags != flags) 1114 if (expect_false (lastcell.flags != flags))
1265 { 1115 {
1266 lastcell.flags = flags; 1116 lastcell.flags = flags;
1267 1117
1268 mask |= 0x8; 1118 mask |= 0x8;
1269 *last_ext |= 0x80; 1119 *last_ext |= 0x80;
1270 last_ext = &sl[sl.length ()]; 1120 last_ext = &sl[sl.length ()];
1271 1121
1272 sl << uint8 (8) << uint8 (flags); 1122 sl << uint8 (8) << uint8 (flags);
1273 }
1274 } 1123 }
1275 1124
1125 // faces
1126
1276 /* Floor face */ 1127 /* Floor face */
1277 if (update_space (sl, socket, ms, lastcell, 2)) 1128 if (update_space (sl, socket, ms, lastcell, 2))
1278 mask |= 0x4; 1129 mask |= 0x4;
1279 1130
1280 /* Middle face */ 1131 /* Middle face */
1281 if (update_space (sl, socket, ms, lastcell, 1)) 1132 if (update_space (sl, socket, ms, lastcell, 1))
1282 mask |= 0x2; 1133 mask |= 0x2;
1283 1134
1135 if (expect_false (ob->invisible)
1136 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1284 if (ms.player () == ob 1137 && ms.player () == ob)
1285 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1286 { 1138 {
1287 // force player to be visible to himself if invisible 1139 // force player to be visible to himself if invisible
1288 if (lastcell.faces[0] != ob->face) 1140 if (lastcell.faces[0] != ob->face)
1289 { 1141 {
1290 lastcell.faces[0] = ob->face; 1142 lastcell.faces[0] = ob->face;
1291 1143
1292 mask |= 0x1;
1293 sl << uint16 (ob->face);
1294
1295 socket.send_faces (ob);
1296 }
1297 }
1298 /* Top face */
1299 else if (update_space (sl, socket, ms, lastcell, 0))
1300 mask |= 0x1; 1144 mask |= 0x1;
1145 sl << uint16 (ob->face);
1301 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
1302 /* Check to see if we are in fact sending anything for this 1154 /* Check to see if we are in fact sending anything for this
1303 * space by checking the mask. If so, update the mask. 1155 * space by checking the mask. If so, update the mask.
1304 * if not, reset the len to that from before adding the mask 1156 * if not, reset the len to that from before adding the mask
1305 * value, so we don't send those bits. 1157 * value, so we don't send those bits.
1306 */ 1158 */
1307 if (mask & 0xf) 1159 if (mask & 0xf)
1308 sl[oldlen + 1] = mask & 0xff; 1160 sl[oldlen + 1] = mask & 0xff;
1309 else 1161 else
1310 sl.reset (oldlen); 1162 sl.reset (oldlen);
1311
1312 if (socket.ext_mapinfos)
1313 esl << uint16 (emask);
1314
1315 if (socket.EMI_smooth)
1316 {
1317 for (int layer = 2+1; layer--; )
1318 {
1319 object *ob = ms.faces_obj [layer];
1320
1321 // If there is no object for this space, or if the face for the object
1322 // is the blank face, set the smoothlevel to zero.
1323 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1324
1325 // We've gotten what face we want to use for the object. Now see if
1326 // if it has changed since we last sent it to the client.
1327 if (lastcell.smooth[layer] != smoothlevel)
1328 {
1329 lastcell.smooth[layer] = smoothlevel;
1330 esl << uint8 (smoothlevel);
1331 emask |= 1 << layer;
1332 }
1333 }
1334
1335 if (emask & 0xf)
1336 esl[eoldlen + 1] = emask & 0xff;
1337 else
1338 esl.reset (eoldlen);
1339 }
1340 } /* else this is a viewable space */ 1163 } /* else this is a viewable space */
1341 } /* for x loop */ 1164 ordered_mapwalk_end
1342 } /* for y loop */
1343 1165
1344 socket.flush_fx (); 1166 socket.flush_fx ();
1345
1346 /* Verify that we in fact do need to send this */
1347 if (socket.ext_mapinfos)
1348 {
1349 if (!(sl.length () > startlen || socket.sent_scroll))
1350 {
1351 /* No map data will follow, so don't say the client
1352 * it doesn't need draw!
1353 */
1354 ewhatflag &= ~EMI_NOREDRAW;
1355 esl[ewhatstart + 1] = ewhatflag & 0xff;
1356 }
1357
1358 if (esl.length () > estartlen)
1359 socket.send_packet (esl);
1360 }
1361 1167
1362 if (sl.length () > startlen || socket.sent_scroll) 1168 if (sl.length () > startlen || socket.sent_scroll)
1363 { 1169 {
1364 socket.send_packet (sl); 1170 socket.send_packet (sl);
1365 socket.sent_scroll = 0; 1171 socket.sent_scroll = 0;
1366 } 1172 }
1367} 1173}
1368 1174
1369/*****************************************************************************/
1370/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1371/* a player. Of course, the client need to know the command to be able to */
1372/* manage it ! */
1373/*****************************************************************************/
1374void
1375send_plugin_custom_message (object *pl, char *buf)
1376{
1377 pl->contr->ns->send_packet (buf);
1378}
1379
1380/**
1381 * This sends the skill number to name mapping. We ignore
1382 * the params - we always send the same info no matter what.
1383 */
1384void
1385send_skill_info (client *ns, char *params)
1386{
1387 packet sl;
1388 sl << "replyinfo skill_info\n";
1389
1390 for (int i = 1; i < NUM_SKILLS; i++)
1391 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1392
1393 if (sl.length () > MAXSOCKBUF)
1394 {
1395 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1396 fatal (0);
1397 }
1398
1399 ns->send_packet (sl);
1400}
1401
1402/**
1403 * This sends the spell path to name mapping. We ignore
1404 * the params - we always send the same info no matter what.
1405 */
1406void
1407send_spell_paths (client * ns, char *params)
1408{
1409 packet sl;
1410
1411 sl << "replyinfo spell_paths\n";
1412
1413 for (int i = 0; i < NRSPELLPATHS; i++)
1414 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1415
1416 if (sl.length () > MAXSOCKBUF)
1417 {
1418 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1419 fatal (0);
1420 }
1421
1422 ns->send_packet (sl);
1423}
1424
1425/** 1175/**
1426 * 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.
1427 * 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
1428 */ 1178 */
1429void 1179void
1430esrv_update_spells (player *pl) 1180esrv_update_spells (player *pl)
1431{ 1181{
1432 if (!pl->ns) 1182 if (!pl->ns)
1433 return; 1183 return;
1434 1184
1185 pl->ns->update_spells = false;
1186
1435 if (!pl->ns->monitor_spells) 1187 if (!pl->ns->monitor_spells)
1436 return; 1188 return;
1437 1189
1438 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1190 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1439 {
1440 if (spell->type == SPELL) 1191 if (spell->type == SPELL)
1441 { 1192 {
1442 int flags = 0; 1193 int flags = 0;
1194 int val;
1443 1195
1444 /* check if we need to update it */ 1196 /* check if we need to update it */
1445 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)
1446 { 1199 {
1447 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1200 spell->cached_sp = val;
1448 flags |= UPD_SP_MANA; 1201 flags |= UPD_SP_MANA;
1449 } 1202 }
1450 1203
1451 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)
1452 { 1206 {
1453 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1207 spell->cached_grace = val;
1454 flags |= UPD_SP_GRACE; 1208 flags |= UPD_SP_GRACE;
1455 } 1209 }
1456 1210
1457 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)
1458 { 1213 {
1459 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1214 spell->cached_eat = val;
1460 flags |= UPD_SP_DAMAGE; 1215 flags |= UPD_SP_LEVEL;
1461 } 1216 }
1462 1217
1463 if (flags) 1218 if (flags)
1464 { 1219 {
1465 packet sl; 1220 packet sl;
1466 1221
1467 sl << "updspell " 1222 sl << "updspell "
1468 << uint8 (flags) 1223 << uint8 (flags)
1469 << uint32 (spell->count); 1224 << uint32 (spell->count);
1470 1225
1471 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1226 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1472 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1227 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1473 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1228 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1474 1229
1475 pl->ns->send_packet (sl); 1230 pl->ns->send_packet (sl);
1476 } 1231 }
1477 } 1232 }
1478 }
1479} 1233}
1480 1234
1481void 1235void
1482esrv_remove_spell (player *pl, object *spell) 1236esrv_remove_spell (player *pl, object *spell)
1483{ 1237{
1508 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);
1509 return; 1263 return;
1510 } 1264 }
1511 1265
1512 /* 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 */
1513 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);
1514 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);
1515 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1269 spell->cached_eat = casting_level (pl->ob, spell);
1516 1270
1517 /* figure out which skill it uses, if it uses one */ 1271 /* figure out which skill it uses, if it uses one */
1518 if (spell->skill) 1272 if (spell->skill)
1519 { 1273 if (object *tmp = pl->find_skill (spell->skill))
1520 for (i = 1; i < NUM_SKILLS; i++)
1521 if (!strcmp (spell->skill, skill_names[i]))
1522 {
1523 skill = i + CS_STAT_SKILLINFO; 1274 skill = tmp->subtype + CS_STAT_SKILLINFO;
1524 break;
1525 }
1526 }
1527 1275
1528 // spells better have a face 1276 // spells better have a face
1529 if (!spell->face) 1277 if (!spell->face)
1530 { 1278 {
1531 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);
1536 1284
1537 /* send the current values */ 1285 /* send the current values */
1538 sl << uint32 (spell->count) 1286 sl << uint32 (spell->count)
1539 << uint16 (spell->level) 1287 << uint16 (spell->level)
1540 << uint16 (spell->casting_time) 1288 << uint16 (spell->casting_time)
1541 << uint16 (spell->last_sp) 1289 << uint16 (spell->cached_sp)
1542 << uint16 (spell->last_grace) 1290 << uint16 (spell->cached_grace)
1543 << uint16 (spell->last_eat) 1291 << uint16 (spell->cached_eat)
1544 << uint8 (skill) 1292 << uint8 (skill)
1545 << uint32 (spell->path_attuned) 1293 << uint32 (spell->path_attuned)
1546 << uint32 (spell->face) 1294 << uint32 (spell->face)
1547 << data8 (spell->name) 1295 << data8 (spell->name)
1548 << data16 (spell->msg); 1296 << data16 (spell->msg);
1615 /* finally, we can send the packet */ 1363 /* finally, we can send the packet */
1616 pl->ns->flush_fx (); 1364 pl->ns->flush_fx ();
1617 pl->ns->send_packet (sl); 1365 pl->ns->send_packet (sl);
1618} 1366}
1619 1367
1368//-GPL
1369

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines