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.119 by root, Fri Aug 24 00:26:10 2007 UTC vs.
Revision 1.194 by root, Sun Jan 29 02:47:06 2017 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,2011,2012,2013,2014,2015,2016 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 *
28 * \date 2003-12-02 31 * \date 2003-12-02
29 * 32 *
30 * This file implements all of the goo on the server side for handling 33 * This file implements all of the goo on the server side for handling
31 * clients. It's got a bunch of global variables for keeping track of 34 * clients. It's got a bunch of global variables for keeping track of
32 * each of the clients. 35 * each of the clients.
33 * 36 *
34 * Note: All functions that are used to process data from the client 37 * Note: All functions that are used to process data from the client
35 * have the prototype of (char *data, int datalen, int client_num). This 38 * have the prototype of (char *data, int datalen, int client_num). This
36 * way, we can use one dispatch table. 39 * way, we can use one dispatch table.
37 * 40 *
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] =
69 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC, 71{
70 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID, 72 CS_STAT_RES_PHYS,
71 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ , 73 CS_STAT_RES_MAG,
72 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 74 CS_STAT_RES_FIRE,
73 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD, 75 CS_STAT_RES_ELEC,
74 CS_STAT_RES_FEAR, -1 /* Cancellation */ , 76 CS_STAT_RES_COLD,
75 CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH, 77 CS_STAT_RES_CONF,
76 -1 /* Chaos */ , -1 /* Counterspell */ , 78 CS_STAT_RES_ACID,
77 -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,
78 CS_STAT_RES_BLIND, 94 CS_STAT_RES_BLIND,
79 -1, /* Internal */ 95 -1, /* Internal */
80 -1, /* life stealing */ 96 -1, /* life stealing */
81 -1 /* Disease - not fully done yet */ 97 -1 /* Disease - not fully done yet */
82}; 98};
98 */ 114 */
99 mx = ns->mapx; 115 mx = ns->mapx;
100 my = ns->mapy; 116 my = ns->mapy;
101 117
102 /* 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
103 * (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,
104 * if the destination x or y coordinate is outside the viewable 120 * if the destination x or y coordinate is outside the viewable
105 * area, we clear the values - otherwise, the old values 121 * area, we clear the values - otherwise, the old values
106 * 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.
107 */ 123 */
108 for (x = 0; x < mx; x++) 124 for (x = 0; x < mx; x++)
109 {
110 for (y = 0; y < my; y++) 125 for (y = 0; y < my; y++)
111 {
112 if (x >= ns->mapx || y >= ns->mapy) 126 if (x >= ns->mapx || y >= ns->mapy)
113 /* clear cells outside the viewable area */ 127 /* clear cells outside the viewable area */
114 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 128 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) 129 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 */ 130 /* clear newly visible tiles within the viewable area */
117 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 131 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
118 else 132 else
119 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));
120 }
121 }
122 134
123 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 135 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
124 136
125 /* 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
126 * empty). 138 * empty).
134 pl->ns->mapinfo_queue_clear (); 146 pl->ns->mapinfo_queue_clear ();
135 147
136 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 148 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
137 149
138 pl->ns->force_newmap = false; 150 pl->ns->force_newmap = false;
139
140 if (pl->ns->newmapcmd == 1)
141 pl->ns->send_packet ("newmap"); 151 pl->ns->send_packet ("newmap");
142
143 pl->ns->floorbox_reset (); 152 pl->ns->floorbox_reset ();
153}
154
155static void
156send_map_info (player *pl)
157{
158 client &socket = *pl->ns;
159 object *ob = pl->viewpoint;
160
161 if (socket.mapinfocmd)
162 {
163 if (ob->map && ob->map->path)
164 {
165 int flags = 0;
166
167 // due to historical glitches, the bit ordering and map index ordering differs
168 if (ob->map->tile_path [TILE_NORTH]) flags |= 0x01;
169 if (ob->map->tile_path [TILE_EAST ]) flags |= 0x02;
170 if (ob->map->tile_path [TILE_SOUTH]) flags |= 0x04;
171 if (ob->map->tile_path [TILE_WEST ]) flags |= 0x08;
172 // these two are debatable
173 if (ob->map->tile_path [TILE_UP ]) flags |= 0x10;
174 if (ob->map->tile_path [TILE_DOWN ]) flags |= 0x20;
175
176 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
177 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
178 ob->map->width, ob->map->height, &ob->map->path);
179 }
180 else
181 socket.send_packet ("mapinfo current");
182 }
144} 183}
145 184
146/** check for map/region change and send new map data */ 185/** check for map/region change and send new map data */
147static void 186static void
148check_map_change (player *pl) 187check_map_change (player *pl)
149{ 188{
150 client &socket = *pl->ns; 189 client &socket = *pl->ns;
151 object *ob = pl->observe; 190 object *ob = pl->viewpoint;
191
192 region *reg = ob->region ();
193 if (socket.current_region != reg)
194 {
195 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
196 socket.current_region = reg;
197 }
198
199 // first try to avoid a full newmap on tiled map scrolls
200 if (socket.current_map != ob->map && !socket.force_newmap)
201 {
202 rv_vector rv;
203
204 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
205
206 // manhattan distance is very handy here
207 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
208 {
209 socket.current_map = ob->map;
210 socket.current_x = ob->x;
211 socket.current_y = ob->y;
212
213 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
214 socket.floorbox_reset ();
215 send_map_info (pl);
216 }
217 }
152 218
153 if (socket.current_map != ob->map || socket.force_newmap) 219 if (socket.current_map != ob->map || socket.force_newmap)
154 { 220 {
155 clear_map (pl); 221 clear_map (pl);
156 socket.current_map = ob->map; 222 socket.current_map = ob->map;
157 223 send_map_info (pl);
158 if (socket.mapinfocmd)
159 {
160 if (ob->map && ob->map->path[0])
161 {
162 int flags = 0;
163
164 if (ob->map->tile_path[0]) flags |= 1;
165 if (ob->map->tile_path[1]) flags |= 2;
166 if (ob->map->tile_path[2]) flags |= 4;
167 if (ob->map->tile_path[3]) flags |= 8;
168
169 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
170 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
171 ob->map->width, ob->map->height, &ob->map->path);
172 }
173 else
174 socket.send_packet ("mapinfo current");
175 }
176 } 224 }
177 else if (socket.current_x != ob->x || socket.current_y != ob->y) 225 else if (socket.current_x != ob->x || socket.current_y != ob->y)
178 { 226 {
179 int dx = ob->x - socket.current_x; 227 int dx = ob->x - socket.current_x;
180 int dy = ob->y - socket.current_y; 228 int dy = ob->y - socket.current_y;
181 229
182 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
183 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
184 else
185 {
186 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 230 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
187 socket.floorbox_reset (); 231 socket.floorbox_reset ();
188 }
189 } 232 }
190 233
191 socket.current_x = ob->x; 234 socket.current_x = ob->x;
192 socket.current_y = ob->y; 235 socket.current_y = ob->y;
236}
193 237
194 region *reg = ob->region (); 238/**
195 if (socket.current_region != reg) 239 * This sends the skill number to name mapping. We ignore
196 { 240 * the params - we always send the same info no matter what.
197 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region)); 241 */
198 socket.current_region = reg; 242static void
199 } 243send_skill_info (client *ns, char *params)
244{
245 packet sl;
246 sl << "replyinfo skill_info\n";
247
248 for (int i = 0; i < skillvec.size (); ++i)
249 sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name);
250
251 if (sl.length () > MAXSOCKBUF)
252 cleanup ("buffer overflow in send_skill_info!");
253
254 ns->send_packet (sl);
255}
256
257/**
258 * This sends the spell path to name mapping. We ignore
259 * the params - we always send the same info no matter what.
260 */
261static void
262send_spell_paths (client * ns, char *params)
263{
264 packet sl;
265
266 sl << "replyinfo spell_paths\n";
267
268 for (int i = 0; i < NRSPELLPATHS; i++)
269 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
270
271 if (sl.length () > MAXSOCKBUF)
272 cleanup ("buffer overflow in send_spell_paths!");
273
274 ns->send_packet (sl);
200} 275}
201 276
202/** 277/**
203 * RequestInfo is sort of a meta command. There is some specific 278 * RequestInfo is sort of a meta command. There is some specific
204 * request of information, but we call other functions to provide 279 * request of information, but we call other functions to provide
205 * that information. 280 * that information.
281 * requestinfo is completely deprecated, use resource exti request
282 * and the fxix or http protocols.
206 */ 283 */
207void 284void
208RequestInfo (char *buf, int len, client *ns) 285RequestInfo (char *buf, int len, client *ns)
209{ 286{
210 char *params; 287 char *params;
217 { 294 {
218 *params++ = 0; 295 *params++ = 0;
219 break; 296 break;
220 } 297 }
221 298
222 if (!strcmp (buf, "image_info"))
223 send_image_info (ns, params);
224 else if (!strcmp (buf, "image_sums"))
225 send_image_sums (ns, params);
226 else if (!strcmp (buf, "skill_info")) 299 if (!strcmp (buf, "skill_info"))
227 send_skill_info (ns, params); 300 send_skill_info (ns, params);
228 else if (!strcmp (buf, "spell_paths")) 301 else if (!strcmp (buf, "spell_paths"))
229 send_spell_paths (ns, params); 302 send_spell_paths (ns, params);
230 else 303 else
231 { 304 {
247ExtiCmd (char *buf, int len, client *ns) 320ExtiCmd (char *buf, int len, client *ns)
248{ 321{
249 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 322 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
250} 323}
251 324
325//-GPL
326
252void 327void
253client::mapinfo_queue_clear () 328client::mapinfo_queue_clear ()
254{ 329{
255 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) 330 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
256 free (*i); 331 free (*i);
263{ 338{
264 char *token = buf; 339 char *token = buf;
265 buf += strlen (buf) + 9; 340 buf += strlen (buf) + 9;
266 341
267 // initial map and its origin 342 // initial map and its origin
268 maptile *map = pl->ob->map; 343 maptile *map = pl->viewpoint->map;
269 int mapx = pl->ns->mapx / 2 - pl->ob->x; 344 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
270 int mapy = pl->ns->mapy / 2 - pl->ob->y; 345 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
271 int max_distance = 8; // limit maximum path length to something generous 346 int max_distance = 8; // limit maximum path length to something generous
272 347
273 while (*buf && map && max_distance) 348 while (*buf && map && max_distance)
274 { 349 {
275 int dir = *buf++ - '1'; 350 int dir = *buf++ - '1';
276 351
277 if (dir >= 0 && dir <= 3) 352 // due to historical glitches, the mapinfo index and tile index differs
353 static unsigned char dirmap [] = { TILE_NORTH, TILE_EAST, TILE_SOUTH, TILE_WEST, TILE_UP, TILE_DOWN };
354
355 // maybe we should only allow the four flat directions
356 if (IN_RANGE_EXC (dir, 0, array_length (dirmap)))
278 { 357 {
358 dir = dirmap [dir];
359
279 if (!map->tile_path [dir]) 360 if (!map->tile_path [dir])
280 map = 0; 361 map = 0;
281 else if (map->tile_available (dir)) 362 else if (map->tile_available (dir, false))
282 { 363 {
283 maptile *neigh = map->tile_map [dir]; 364 maptile *neigh = map->tile_map [dir];
284 365
285 switch (dir) 366 switch (dir)
286 { 367 {
300 max_distance = 0; 381 max_distance = 0;
301 } 382 }
302 383
303 if (!max_distance) 384 if (!max_distance)
304 send_packet_printf ("mapinfo %s error", token); 385 send_packet_printf ("mapinfo %s error", token);
305 else if (!map || !map->path[0]) 386 else if (!map || !map->path)
306 send_packet_printf ("mapinfo %s nomap", token); 387 send_packet_printf ("mapinfo %s nomap", token);
307 else 388 else
308 { 389 {
309 int flags = 0; 390 int flags = 0;
310 391
392 // due to historical glitches, the bit ordering and map index ordering differs
311 if (map->tile_path[0]) flags |= 1; 393 if (map->tile_path [TILE_NORTH]) flags |= 0x01;
312 if (map->tile_path[1]) flags |= 2; 394 if (map->tile_path [TILE_EAST ]) flags |= 0x02;
313 if (map->tile_path[2]) flags |= 4; 395 if (map->tile_path [TILE_SOUTH]) flags |= 0x04;
314 if (map->tile_path[3]) flags |= 8; 396 if (map->tile_path [TILE_WEST ]) flags |= 0x08;
397 // these two are debatable
398 if (map->tile_path [TILE_UP ]) flags |= 0x10;
399 if (map->tile_path [TILE_DOWN ]) flags |= 0x20;
315 400
316 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); 401 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
317 } 402 }
318 403
319 return 1; 404 return 1;
380AddMeCmd (char *buf, int len, client *ns) 465AddMeCmd (char *buf, int len, client *ns)
381{ 466{
382 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 467 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
383} 468}
384 469
385/** Reply to ExtendedInfos command */ 470//+GPL
386void
387ToggleExtendedInfos (char *buf, int len, client * ns)
388{
389 char cmdback[MAX_BUF];
390 char command[50];
391 int info, nextinfo;
392
393 cmdback[0] = '\0';
394 nextinfo = 0;
395
396 while (1)
397 {
398 /* 1. Extract an info */
399 info = nextinfo;
400
401 while ((info < len) && (buf[info] == ' '))
402 info++;
403
404 if (info >= len)
405 break;
406
407 nextinfo = info + 1;
408
409 while ((nextinfo < len) && (buf[nextinfo] != ' '))
410 nextinfo++;
411
412 if (nextinfo - info >= 49) /*Erroneous info asked */
413 continue;
414
415 strncpy (command, &(buf[info]), nextinfo - info);
416
417 /* 2. Interpret info */
418 if (!strcmp ("smooth", command))
419 /* Toggle smoothing */
420 ns->EMI_smooth = !ns->EMI_smooth;
421 else
422 /*bad value */;
423
424 /*3. Next info */
425 }
426
427 strcpy (cmdback, "ExtendedInfoSet");
428
429 if (ns->EMI_smooth)
430 {
431 strcat (cmdback, " ");
432 strcat (cmdback, "smoothing");
433 }
434
435 ns->send_packet (cmdback);
436}
437
438/*
439#define MSG_TYPE_BOOK 1
440#define MSG_TYPE_CARD 2
441#define MSG_TYPE_PAPER 3
442#define MSG_TYPE_SIGN 4
443#define MSG_TYPE_MONUMENT 5
444#define MSG_TYPE_SCRIPTED_DIALOG 6*/
445
446/** Reply to ExtendedInfos command */
447void
448ToggleExtendedText (char *buf, int len, client * ns)
449{
450 char cmdback[MAX_BUF];
451 char temp[10];
452 char command[50];
453 int info, nextinfo, i, flag;
454
455 cmdback[0] = '\0';
456
457 nextinfo = 0;
458 while (1)
459 {
460 /* 1. Extract an info */
461 info = nextinfo;
462
463 while ((info < len) && (buf[info] == ' '))
464 info++;
465
466 if (info >= len)
467 break;
468
469 nextinfo = info + 1;
470
471 while ((nextinfo < len) && (buf[nextinfo] != ' '))
472 nextinfo++;
473
474 if (nextinfo - info >= 49) /*Erroneous info asked */
475 continue;
476
477 strncpy (command, &(buf[info]), nextinfo - info);
478 command[nextinfo - info] = '\0';
479 /* 2. Interpret info */
480 i = sscanf (command, "%d", &flag);
481
482 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
483 ns->supported_readables |= (1 << flag);
484 /*3. Next info */
485 }
486
487 /* Send resulting state */
488 strcpy (cmdback, "ExtendedTextSet");
489
490 for (i = 0; i <= MSG_TYPE_LAST; i++)
491 if (ns->supported_readables & (1 << i))
492 {
493 strcat (cmdback, " ");
494 snprintf (temp, sizeof (temp), "%d", i);
495 strcat (cmdback, temp);
496 }
497
498 ns->send_packet (cmdback);
499}
500 471
501/** 472/**
502 * This handles the general commands from the client (ie, north, fire, cast, 473 * This handles the general commands from the client (ie, north, fire, cast,
503 * etc.) 474 * etc.)
504 */ 475 */
517 return; 488 return;
518 489
519 buf++; 490 buf++;
520 } 491 }
521 492
522 execute_newserver_command (pl->ob, (char *) buf); 493 execute_newserver_command (pl->ob, (char *)buf);
523 494
524 /* Perhaps something better should be done with a left over count. 495 /* Perhaps something better should be done with a left over count.
525 * Cleaning up the input should probably be done first - all actions 496 * Cleaning up the input should probably be done first - all actions
526 * for the command that issued the count should be done before any other 497 * for the command that issued the count should be done before any other
527 * commands. 498 * commands.
528 */ 499 */
529 pl->count = 0; 500 pl->count = 0;
530}
531
532/**
533 * This handles the general commands from the client (ie, north, fire, cast,
534 * etc.). It is a lot like PlayerCmd above, but is called with the
535 * 'ncom' method which gives more information back to the client so it
536 * can throttle.
537 */
538void
539NewPlayerCmd (char *buf, int len, player *pl)
540{
541 if (len <= 6)
542 {
543 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
544 return;
545 }
546
547 uint16 cmdid = net_uint16 ((uint8 *)buf);
548 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
549
550 /* -1 is special - no repeat, but don't update */
551 if (repeat != -1)
552 pl->count = repeat;
553
554 buf += 6; //len -= 6;
555
556 execute_newserver_command (pl->ob, buf);
557
558 /* Perhaps something better should be done with a left over count.
559 * Cleaning up the input should probably be done first - all actions
560 * for the command that issued the count should be done before any other
561 * commands.
562 */
563 pl->count = 0;
564
565 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
566 int time = fabs (pl->ob->speed) < 0.001
567 ? time = MAX_TIME * 100
568 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
569
570 /* Send confirmation of command execution now */
571 packet sl ("comc");
572 sl << uint16 (cmdid) << uint32 (time);
573 pl->ns->send_packet (sl);
574} 501}
575 502
576/** This is a reply to a previous query. */ 503/** This is a reply to a previous query. */
577void 504void
578ReplyCmd (char *buf, int len, client *ns) 505ReplyCmd (char *buf, int len, client *ns)
615 LOG (llevError, "Unknown input state: %d\n", ns->state); 542 LOG (llevError, "Unknown input state: %d\n", ns->state);
616 } 543 }
617} 544}
618 545
619/** 546/**
620 * Client tells its version. If there is a mismatch, we close the 547 * Client tells its version info.
621 * socket. In real life, all we should care about is the client having
622 * something older than the server. If we assume the client will be
623 * backwards compatible, having it be a later version should not be a
624 * problem.
625 */ 548 */
626void 549void
627VersionCmd (char *buf, int len, client * ns) 550VersionCmd (char *buf, int len, client *ns)
628{ 551{
629 if (!buf) 552 INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
630 {
631 LOG (llevError, "CS: received corrupted version command\n");
632 return;
633 }
634
635 ns->cs_version = atoi (buf);
636 ns->sc_version = ns->cs_version;
637
638 LOG (llevDebug, "connection from client <%s>\n", buf);
639
640 //TODO: should log here just for statistics
641
642 //if (VERSION_CS != ns->cs_version)
643 // unchecked;
644
645 char *cp = strchr (buf + 1, ' ');
646 if (!cp)
647 return;
648
649 ns->sc_version = atoi (cp);
650
651 //if (VERSION_SC != ns->sc_version)
652 // unchecked;
653
654 cp = strchr (cp + 1, ' ');
655
656 if (cp)
657 {
658 ns->version = cp + 1;
659
660 if (ns->sc_version < 1026)
661 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
662 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
663 }
664} 553}
665 554
666/** sound related functions. */ 555/** sound related functions. */
667void 556void
668SetSound (char *buf, int len, client * ns) 557SetSound (char *buf, int len, client * ns)
686 * syntax is: move (to) (tag) (nrof) 575 * syntax is: move (to) (tag) (nrof)
687 */ 576 */
688void 577void
689MoveCmd (char *buf, int len, player *pl) 578MoveCmd (char *buf, int len, player *pl)
690{ 579{
691 int vals[3], i; 580 int to, tag, nrof;
692 581
693 /* A little funky here. We only cycle for 2 records, because 582 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
694 * we obviously are not going to find a space after the third
695 * record. Perhaps we should just replace this with a
696 * sscanf?
697 */
698 for (i = 0; i < 2; i++)
699 { 583 {
700 vals[i] = atoi (buf);
701
702 if (!(buf = strchr (buf, ' ')))
703 {
704 LOG (llevError, "Incomplete move command: %s\n", buf); 584 LOG (llevError, "Incomplete move command: %s\n", buf);
705 return; 585 return;
706 }
707
708 buf++;
709 } 586 }
710 587
711 vals[2] = atoi (buf); 588 esrv_move_object (pl->ob, to, tag, nrof);
712
713/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
714 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
715} 589}
716 590
717/****************************************************************************** 591/******************************************************************************
718 * 592 *
719 * Start of commands the server sends to the client. 593 * Start of commands the server sends to the client.
734 * Get player's current range attack in obuf. 608 * Get player's current range attack in obuf.
735 */ 609 */
736static void 610static void
737rangetostring (player *pl, char *obuf) 611rangetostring (player *pl, char *obuf)
738{ 612{
739 dynbuf_text buf; 613 dynbuf_text &buf = msg_dynbuf; buf.clear ();
614
615#if 0
616 // print ranged/chosen_skill etc. objects every call
617 printf ("%s %s => %s (%s)\n",
618 pl->ranged_ob ? &pl->ranged_ob->name : "-",
619 pl->combat_ob ? &pl->combat_ob->name : "-",
620 pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
621 pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
622 );
623#endif
740 624
741 if (pl->ranged_ob) 625 if (pl->ranged_ob)
742 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 626 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
743 627
744 if (pl->combat_ob) 628 if (pl->combat_ob)
790 * commands for now. 674 * commands for now.
791 */ 675 */
792void 676void
793esrv_update_stats (player *pl) 677esrv_update_stats (player *pl)
794{ 678{
795 char buf[MAX_BUF];
796 uint16 flags;
797
798 client *ns = pl->ns; 679 client *ns = pl->ns;
799 if (!ns) 680 if (!ns)
800 return; 681 return;
801 682
802 object *ob = pl->observe; 683 object *ob = pl->observe;
819 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 700 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 701 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 702 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 703 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
823 704
824 for (int s = 0; s < NUM_SKILLS; s++) 705 for (int s = 0; s < CS_NUM_SKILLS; s++)
825 if (object *skill = opl->last_skill_ob[s]) 706 if (object *skill = opl->last_skill_ob [s])
826 if (skill->stats.exp != ns->last_skill_exp [s]) 707 if (skill->stats.exp != ns->last_skill_exp [s])
827 { 708 {
828 ns->last_skill_exp [s] = skill->stats.exp; 709 ns->last_skill_exp [s] = skill->stats.exp;
829 710
830 /* Always send along the level if exp changes. This is only 711 /* Always send along the level if exp changes. This is only
831 * 1 extra byte, but keeps processing simpler. 712 * 1 extra byte, but keeps processing simpler.
832 */ 713 */
833 sl << uint8 (s + CS_STAT_SKILLINFO) 714 sl << uint8 (CS_STAT_SKILLINFO + s)
834 << uint8 (skill->level) 715 << uint8 (skill->level)
835 << uint64 (skill->stats.exp); 716 << uint64 (skill->stats.exp);
836 } 717 }
837 718
838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 719 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
839 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 720 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
840 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 721 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
841 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 722 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
842 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 723 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
843 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK); 724 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 725 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
845 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); 726 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
846 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 727 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
847 728
848 flags = 0; 729 int flags = (opl->fire_on ? SF_FIREON : 0)
849 730 | (opl->run_on ? SF_RUNON : 0);
850 if (opl->fire_on)
851 flags |= SF_FIREON;
852
853 if (opl->run_on)
854 flags |= SF_RUNON;
855 731
856 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 732 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
857 733
858 if (ns->sc_version < 1025)
859 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
860 else
861 for (int i = 0; i < NROFATTACKS; i++) 734 for (int i = 0; i < NROFATTACKS; i++)
862 {
863 /* Skip ones we won't send */ 735 /* Skip ones we won't send */
864 if (atnr_cs_stat[i] == -1) 736 if (atnr_cs_stat[i] >= 0)
865 continue;
866
867 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 737 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
868 }
869 738
870 if (pl->ns->monitor_spells) 739 if (pl->ns->monitor_spells)
871 { 740 {
872 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 741 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
873 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 742 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
874 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 743 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
875 } 744 }
876 745
746 char buf[MAX_BUF];
877 rangetostring (opl, buf); /* we want use the new fire & run system in new client */ 747 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
878 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 748 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
879 set_title (ob, buf); 749 set_title (ob, buf);
880 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 750 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
881 751
886 756
887/** 757/**
888 * Tells the client that here is a player it should start using. 758 * Tells the client that here is a player it should start using.
889 */ 759 */
890void 760void
891esrv_new_player (player *pl, uint32 weight) 761esrv_new_player (player *pl)
892{ 762{
763 sint32 weight = pl->ob->client_weight ();
764
893 packet sl ("player"); 765 packet sl ("player");
894 766
895 sl << uint32 (pl->ob->count) 767 sl << uint32 (pl->ob->count)
896 << uint32 (weight) 768 << uint32 (weight)
897 << uint32 (pl->ob->face) 769 << uint32 (pl->ob->face)
898 << data8 (pl->ob->name); 770 << data8 (pl->ob->name);
899 771
900 pl->ns->last_weight = weight; 772 pl->ns->last_weight = weight;
901 pl->ns->send_packet (sl); 773 pl->ns->send_packet (sl);
902 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
903} 774}
904 775
905/****************************************************************************** 776/******************************************************************************
906 * 777 *
907 * Start of map related commands. 778 * Start of map related commands.
975 /* Nothing changed */ 846 /* Nothing changed */
976 return 0; 847 return 0;
977} 848}
978 849
979/** 850/**
980 * Returns the size of a data for a map square as returned by
981 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
982 * available.
983 */
984int
985getExtendedMapInfoSize (client * ns)
986{
987 int result = 0;
988
989 if (ns->ext_mapinfos)
990 {
991 if (ns->EMI_smooth)
992 result += 1; /*One byte for smoothlevel */
993 }
994
995 return result;
996}
997
998// prefetch (and touch) all maps within a specific distancd
999static void
1000prefetch_surrounding_maps (maptile *map, int distance)
1001{
1002 map->last_access = runtime;
1003
1004 if (--distance)
1005 for (int dir = 4; --dir; )
1006 if (const shstr &path = map->tile_path [dir])
1007 if (maptile *&neigh = map->tile_map [dir])
1008 prefetch_surrounding_maps (neigh, distance);
1009 else
1010 neigh = maptile::find_async (path, map);
1011}
1012
1013// prefetch a generous area around the player
1014static void
1015prefetch_surrounding_maps (object *op)
1016{
1017 prefetch_surrounding_maps (op->map, 3);
1018}
1019
1020/**
1021 * Draws client map. 851 * Draws client map.
1022 */ 852 */
1023void 853void
1024draw_client_map (player *pl) 854draw_client_map (player *pl)
1025{ 855{
1026 object *ob = pl->observe; 856 object *ob = pl->viewpoint;
1027 if (!ob->active) 857 if (!pl->observe->active)
1028 return; 858 return;
1029
1030 maptile *plmap = ob->map;
1031 859
1032 /* If player is just joining the game, he isn't here yet, so the map 860 /* If player is just joining the game, he isn't here yet, so the map
1033 * can get swapped out. If so, don't try to send them a map. All will 861 * can get swapped out. If so, don't try to send them a map. All will
1034 * be OK once they really log in. 862 * be OK once they really log in.
1035 */ 863 */
1036 if (!plmap || plmap->in_memory != MAP_IN_MEMORY) 864 if (!ob->map || ob->map->state != MAP_ACTIVE)
1037 return; 865 return;
1038 866
1039 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1040 int estartlen, eoldlen; 867 int startlen, oldlen;
1041 uint8 eentrysize;
1042 uint16 ewhatstart, ewhatflag;
1043 uint8 extendedinfos;
1044 868
1045 check_map_change (pl); 869 check_map_change (pl);
1046 prefetch_surrounding_maps (pl->ob); 870 pl->ob->prefetch_surrounding_maps ();
1047 871
1048 /* do LOS after calls to update_position */ 872 /* do LOS after calls to update_position */
1049 if (ob != pl->ob) 873 /* unfortunately, we need to udpate los when observing, currently */
1050 clear_los (pl); 874 if (pl->do_los || pl->viewpoint != pl->ob)
1051 else if (pl->do_los)
1052 { 875 {
1053 update_los (ob);
1054 pl->do_los = 0; 876 pl->do_los = 0;
877 pl->update_los ();
1055 } 878 }
1056 879
1057 /** 880 /**
1058 * This function uses the new map1 protocol command to send the map 881 * This function uses the new map1 protocol command to send the map
1059 * to the client. It is necessary because the old map command supports 882 * to the client. It is necessary because the old map command supports
1077 * look like. 900 * look like.
1078 */ 901 */
1079 902
1080 client &socket = *pl->ns; 903 client &socket = *pl->ns;
1081 904
1082 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 905 packet sl ("map1a");
1083 packet esl;
1084 906
1085 startlen = sl.length (); 907 startlen = sl.length ();
1086 908
1087 /*Extendedmapinfo structure initialisation */ 909 int hx = socket.mapx / 2;
1088 if (socket.ext_mapinfos) 910 int hy = socket.mapy / 2;
1089 {
1090 extendedinfos = EMI_NOREDRAW;
1091 911
1092 if (socket.EMI_smooth) 912 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1093 extendedinfos |= EMI_SMOOTH; 913 int ax = dx + hx;
914 int ay = dy + hy;
1094 915
1095 ewhatstart = esl.length (); 916 int mask = (ax << 10) | (ay << 4);
1096 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 917 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1097 could need to be taken away */
1098 eentrysize = getExtendedMapInfoSize (&socket);
1099 esl << "mapextended "
1100 << uint8 (extendedinfos)
1101 << uint8 (eentrysize);
1102 918
1103 estartlen = esl.length (); 919 /* If the coordinates are not valid, or it is too dark to see,
1104 } 920 * we tell the client as such
1105
1106 /* x,y are the real map locations. ax, ay are viewport relative
1107 * locations.
1108 */ 921 */
1109 ay = 0; 922 if (!m)
1110
1111 /* We could do this logic as conditionals in the if statement,
1112 * but that started to get a bit messy to look at.
1113 */
1114 max_x = ob->x + (socket.mapx + 1) / 2;
1115 max_y = ob->y + (socket.mapy + 1) / 2;
1116
1117 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1118 { 923 {
1119 sint16 nx, ny; 924 /* space is out of map. Update space and clear values
1120 maptile *m = 0; 925 * if this hasn't already been done. If the space is out
1121 926 * of the map, it shouldn't have a head.
1122 ax = 0; 927 */
1123 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) 928 if (lastcell.count != -1)
1124 { 929 {
1125 // check to see if we can simply go one right quickly 930 sl << uint16 (mask);
931 map_clearcell (&lastcell, -1);
1126 ++nx; 932 }
1127 if (m && nx >= m->width) 933
934 continue;
935 }
936
937 int d = pl->blocked_los_uc (dx, dy);
938
939 if (d > 3)
940 {
941 /* This block deals with spaces that are not visible for whatever
942 * reason. Still may need to send the head for this space.
943 */
944 if (lastcell.count != -1
945 || lastcell.faces[0]
946 || lastcell.faces[1]
947 || lastcell.faces[2]
948 || lastcell.stat_hp
949 || lastcell.flags
950 || lastcell.player)
951 sl << uint16 (mask);
952
953 /* properly clear a previously sent big face */
954 map_clearcell (&lastcell, -1);
955 }
956 else
957 {
958 /* In this block, the space is visible.
959 */
960
961 /* Rather than try to figure out what everything that we might
962 * need to send is, then form the packet after that,
963 * we presume that we will in fact form a packet, and update
964 * the bits by what we do actually send. If we send nothing,
965 * we just back out sl.length () to the old value, and no harm
966 * is done.
967 * I think this is simpler than doing a bunch of checks to see
968 * what if anything we need to send, setting the bits, then
969 * doing those checks again to add the real data.
970 */
971 oldlen = sl.length ();
972
973 sl << uint16 (mask);
974
975 unsigned char dummy;
976 unsigned char *last_ext = &dummy;
977
978 /* Darkness changed */
979 if (lastcell.count != d)
980 {
1128 m = 0; 981 mask |= 0x8;
1129 982
1130 if (!m) 983 *last_ext |= 0x80;
984 last_ext = &sl[sl.length ()];
985 sl << uint8 (d);
986 }
987
988 lastcell.count = d;
989
990 mapspace &ms = m->at (nx, ny);
991 ms.update ();
992
993 // extmap handling
994 uint8 stat_hp = 0;
995 uint8 stat_width = 0;
996 uint8 flags = 0;
997 tag_t player = 0;
998
999 // send hp information, if applicable
1000 if (object *op = ms.faces_obj [0])
1001 if (op->is_head () && !op->invisible)
1131 { 1002 {
1132 nx = x; ny = y; m = plmap; 1003 if (op->stats.maxhp > op->stats.hp
1133 1004 && op->stats.maxhp > 0
1134 if (!xy_normalise (m, nx, ny)) 1005 && (op->type == PLAYER
1006 || op->type == DOOR // does not work, have maxhp 0
1007 || op->flag [FLAG_MONSTER]
1008 || op->flag [FLAG_ALIVE]
1009 || op->flag [FLAG_GENERATOR]))
1135 m = 0; 1010 {
1011 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1012 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1013 }
1014
1015 if (expect_false (op->has_dialogue ()))
1016 flags |= 1;
1017
1018 if (expect_false (op->type == PLAYER))
1019 player = op == ob ? pl->ob->count
1020 : op == pl->ob ? ob->count
1021 : op->count;
1136 } 1022 }
1137 1023
1138 int emask, mask; 1024 if (expect_false (lastcell.stat_hp != stat_hp))
1139 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1140
1141 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1142
1143 /* If the coordinates are not valid, or it is too dark to see,
1144 * we tell the client as such
1145 */
1146 if (!m)
1147 { 1025 {
1148 /* space is out of map. Update space and clear values 1026 lastcell.stat_hp = stat_hp;
1149 * if this hasn't already been done. If the space is out 1027
1150 * of the map, it shouldn't have a head 1028 mask |= 0x8;
1151 */ 1029 *last_ext |= 0x80;
1152 if (lastcell.count != -1) 1030 last_ext = &sl[sl.length ()];
1031
1032 sl << uint8 (5) << uint8 (stat_hp);
1033
1034 if (stat_width > 1)
1153 { 1035 {
1154 sl << uint16 (mask);
1155 map_clearcell (&lastcell, -1);
1156 }
1157
1158 continue;
1159 }
1160
1161 m->touch ();
1162
1163 int d = pl->blocked_los[ax][ay];
1164
1165 if (d > 3)
1166 {
1167
1168 int need_send = 0, count;
1169
1170 /* This block deals with spaces that are not visible for whatever
1171 * reason. Still may need to send the head for this space.
1172 */
1173
1174 oldlen = sl.length ();
1175
1176 sl << uint16 (mask);
1177
1178 if (lastcell.count != -1)
1179 need_send = 1;
1180
1181 count = -1;
1182
1183 /* properly clear a previously sent big face */
1184 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1185 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1186 need_send = 1;
1187
1188 map_clearcell (&lastcell, count);
1189
1190 if ((mask & 0xf) || need_send)
1191 sl[oldlen + 1] = mask & 0xff;
1192 else
1193 sl.reset (oldlen);
1194 }
1195 else
1196 {
1197 /* In this block, the space is visible.
1198 */
1199
1200 /* Rather than try to figure out what everything that we might
1201 * need to send is, then form the packet after that,
1202 * we presume that we will in fact form a packet, and update
1203 * the bits by what we do actually send. If we send nothing,
1204 * we just back out sl.length () to the old value, and no harm
1205 * is done.
1206 * I think this is simpler than doing a bunch of checks to see
1207 * what if anything we need to send, setting the bits, then
1208 * doing those checks again to add the real data.
1209 */
1210 oldlen = sl.length ();
1211 eoldlen = esl.length ();
1212
1213 sl << uint16 (mask);
1214
1215 unsigned char dummy;
1216 unsigned char *last_ext = &dummy;
1217
1218 /* Darkness changed */
1219 if (lastcell.count != d && socket.darkness)
1220 {
1221 mask |= 0x8;
1222
1223 if (socket.extmap)
1224 {
1225 *last_ext |= 0x80; 1036 *last_ext |= 0x80;
1226 last_ext = &sl[sl.length ()]; 1037 last_ext = &sl[sl.length ()];
1227 sl << uint8 (d); 1038
1228 } 1039 sl << uint8 (6) << uint8 (stat_width);
1229 else
1230 sl << uint8 (255 - 64 * d);
1231 } 1040 }
1041 }
1232 1042
1233 lastcell.count = d; 1043 if (expect_false (lastcell.player != player))
1234
1235 mapspace &ms = m->at (nx, ny);
1236 ms.update ();
1237
1238 if (socket.extmap)
1239 { 1044 {
1240 uint8 stat_hp = 0; 1045 lastcell.player = player;
1241 uint8 stat_width = 0;
1242 uint8 flags = 0;
1243 tag_t player = 0;
1244 1046
1245 // send hp information, if applicable
1246 if (object *op = ms.faces_obj [0])
1247 {
1248 if (op->head || op->invisible)
1249 ; // do not show
1250 else if (op->type == PLAYER
1251 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1252 {
1253 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1254 {
1255 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1256 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1257 }
1258 }
1259
1260 if (op->msg && op->msg[0] == '@')
1261 flags |= 1;
1262
1263 if (op->type == PLAYER && op != ob)
1264 player = op->count;
1265 }
1266
1267 if (lastcell.stat_hp != stat_hp)
1268 {
1269 lastcell.stat_hp = stat_hp;
1270
1271 mask |= 0x8; 1047 mask |= 0x8;
1272 *last_ext |= 0x80; 1048 *last_ext |= 0x80;
1273 last_ext = &sl[sl.length ()]; 1049 last_ext = &sl[sl.length ()];
1274 1050
1275 sl << uint8 (5) << uint8 (stat_hp);
1276
1277 if (stat_width > 1)
1278 {
1279 *last_ext |= 0x80;
1280 last_ext = &sl[sl.length ()];
1281
1282 sl << uint8 (6) << uint8 (stat_width);
1283 }
1284 }
1285
1286 if (lastcell.player != player)
1287 {
1288 lastcell.player = player;
1289
1290 mask |= 0x8;
1291 *last_ext |= 0x80;
1292 last_ext = &sl[sl.length ()];
1293
1294 sl << uint8 (0x47) << uint8 (4) << (uint32)player; 1051 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1295 } 1052 }
1296 1053
1297 if (lastcell.flags != flags) 1054 if (expect_false (lastcell.flags != flags))
1298 { 1055 {
1299 lastcell.flags = flags; 1056 lastcell.flags = flags;
1300 1057
1301 mask |= 0x8; 1058 mask |= 0x8;
1302 *last_ext |= 0x80; 1059 *last_ext |= 0x80;
1303 last_ext = &sl[sl.length ()]; 1060 last_ext = &sl[sl.length ()];
1304 1061
1305 sl << uint8 (8) << uint8 (flags); 1062 sl << uint8 (8) << uint8 (flags);
1306 }
1307 } 1063 }
1308 1064
1065 // faces
1066
1309 /* Floor face */ 1067 /* Floor face */
1310 if (update_space (sl, socket, ms, lastcell, 2)) 1068 if (update_space (sl, socket, ms, lastcell, 2))
1311 mask |= 0x4; 1069 mask |= 0x4;
1312 1070
1313 /* Middle face */ 1071 /* Middle face */
1314 if (update_space (sl, socket, ms, lastcell, 1)) 1072 if (update_space (sl, socket, ms, lastcell, 1))
1315 mask |= 0x2; 1073 mask |= 0x2;
1316 1074
1075 if (expect_false (ob->invisible)
1076 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1317 if (ms.player () == ob 1077 && ms.player () == ob)
1318 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1319 { 1078 {
1320 // force player to be visible to himself if invisible 1079 // force player to be visible to himself if invisible
1321 if (lastcell.faces[0] != ob->face) 1080 if (lastcell.faces[0] != ob->face)
1322 { 1081 {
1323 lastcell.faces[0] = ob->face; 1082 lastcell.faces[0] = ob->face;
1324 1083
1325 mask |= 0x1;
1326 sl << uint16 (ob->face);
1327
1328 socket.send_faces (ob);
1329 }
1330 }
1331 /* Top face */
1332 else if (update_space (sl, socket, ms, lastcell, 0))
1333 mask |= 0x1; 1084 mask |= 0x1;
1085 sl << uint16 (ob->face);
1334 1086
1087 socket.send_faces (ob);
1088 }
1089 }
1090 /* Top face */
1091 else if (update_space (sl, socket, ms, lastcell, 0))
1092 mask |= 0x1;
1093
1335 /* Check to see if we are in fact sending anything for this 1094 /* Check to see if we are in fact sending anything for this
1336 * space by checking the mask. If so, update the mask. 1095 * space by checking the mask. If so, update the mask.
1337 * if not, reset the len to that from before adding the mask 1096 * if not, reset the len to that from before adding the mask
1338 * value, so we don't send those bits. 1097 * value, so we don't send those bits.
1339 */ 1098 */
1340 if (mask & 0xf) 1099 if (mask & 0xf)
1341 sl[oldlen + 1] = mask & 0xff; 1100 sl[oldlen + 1] = mask & 0xff;
1342 else 1101 else
1343 sl.reset (oldlen); 1102 sl.reset (oldlen);
1344
1345 if (socket.ext_mapinfos)
1346 esl << uint16 (emask);
1347
1348 if (socket.EMI_smooth)
1349 {
1350 for (int layer = 2+1; layer--; )
1351 {
1352 object *ob = ms.faces_obj [layer];
1353
1354 // If there is no object for this space, or if the face for the object
1355 // is the blank face, set the smoothlevel to zero.
1356 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1357
1358 // We've gotten what face we want to use for the object. Now see if
1359 // if it has changed since we last sent it to the client.
1360 if (lastcell.smooth[layer] != smoothlevel)
1361 {
1362 lastcell.smooth[layer] = smoothlevel;
1363 esl << uint8 (smoothlevel);
1364 emask |= 1 << layer;
1365 }
1366 }
1367
1368 if (emask & 0xf)
1369 esl[eoldlen + 1] = emask & 0xff;
1370 else
1371 esl.reset (eoldlen);
1372 }
1373 } /* else this is a viewable space */ 1103 } /* else this is a viewable space */
1374 } /* for x loop */ 1104 ordered_mapwalk_end
1375 } /* for y loop */
1376 1105
1377 socket.flush_fx (); 1106 socket.flush_fx ();
1378
1379 /* Verify that we in fact do need to send this */
1380 if (socket.ext_mapinfos)
1381 {
1382 if (!(sl.length () > startlen || socket.sent_scroll))
1383 {
1384 /* No map data will follow, so don't say the client
1385 * it doesn't need draw!
1386 */
1387 ewhatflag &= ~EMI_NOREDRAW;
1388 esl[ewhatstart + 1] = ewhatflag & 0xff;
1389 }
1390
1391 if (esl.length () > estartlen)
1392 socket.send_packet (esl);
1393 }
1394 1107
1395 if (sl.length () > startlen || socket.sent_scroll) 1108 if (sl.length () > startlen || socket.sent_scroll)
1396 { 1109 {
1397 socket.send_packet (sl); 1110 socket.send_packet (sl);
1398 socket.sent_scroll = 0; 1111 socket.sent_scroll = 0;
1399 } 1112 }
1400} 1113}
1401 1114
1402/*****************************************************************************/
1403/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1404/* a player. Of course, the client need to know the command to be able to */
1405/* manage it ! */
1406/*****************************************************************************/
1407void
1408send_plugin_custom_message (object *pl, char *buf)
1409{
1410 pl->contr->ns->send_packet (buf);
1411}
1412
1413/**
1414 * This sends the skill number to name mapping. We ignore
1415 * the params - we always send the same info no matter what.
1416 */
1417void
1418send_skill_info (client *ns, char *params)
1419{
1420 packet sl;
1421 sl << "replyinfo skill_info\n";
1422
1423 for (int i = 1; i < NUM_SKILLS; i++)
1424 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1425
1426 if (sl.length () > MAXSOCKBUF)
1427 {
1428 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1429 fatal (0);
1430 }
1431
1432 ns->send_packet (sl);
1433}
1434
1435/**
1436 * This sends the spell path to name mapping. We ignore
1437 * the params - we always send the same info no matter what.
1438 */
1439void
1440send_spell_paths (client * ns, char *params)
1441{
1442 packet sl;
1443
1444 sl << "replyinfo spell_paths\n";
1445
1446 for (int i = 0; i < NRSPELLPATHS; i++)
1447 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1448
1449 if (sl.length () > MAXSOCKBUF)
1450 {
1451 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1452 fatal (0);
1453 }
1454
1455 ns->send_packet (sl);
1456}
1457
1458/** 1115/**
1459 * This looks for any spells the player may have that have changed their stats. 1116 * This looks for any spells the player may have that have changed their stats.
1460 * it then sends an updspell packet for each spell that has changed in this way 1117 * it then sends an updspell packet for each spell that has changed in this way
1461 */ 1118 */
1462void 1119void
1463esrv_update_spells (player *pl) 1120esrv_update_spells (player *pl)
1464{ 1121{
1465 if (!pl->ns) 1122 if (!pl->ns)
1466 return; 1123 return;
1467 1124
1125 pl->ns->update_spells = false;
1126
1468 if (!pl->ns->monitor_spells) 1127 if (!pl->ns->monitor_spells)
1469 return; 1128 return;
1470 1129
1471 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1130 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1472 {
1473 if (spell->type == SPELL) 1131 if (spell->type == SPELL)
1474 { 1132 {
1475 int flags = 0; 1133 int flags = 0;
1134 int val;
1476 1135
1477 /* check if we need to update it */ 1136 /* check if we need to update it */
1478 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1137 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1138 if (spell->cached_sp != val)
1479 { 1139 {
1480 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1140 spell->cached_sp = val;
1481 flags |= UPD_SP_MANA; 1141 flags |= UPD_SP_MANA;
1482 } 1142 }
1483 1143
1484 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1144 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1145 if (spell->cached_grace != val)
1485 { 1146 {
1486 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1147 spell->cached_grace = val;
1487 flags |= UPD_SP_GRACE; 1148 flags |= UPD_SP_GRACE;
1488 } 1149 }
1489 1150
1490 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1151 val = casting_level (pl->ob, spell);
1152 if (spell->cached_eat != val)
1491 { 1153 {
1492 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1154 spell->cached_eat = val;
1493 flags |= UPD_SP_DAMAGE; 1155 flags |= UPD_SP_LEVEL;
1494 } 1156 }
1495 1157
1496 if (flags) 1158 if (flags)
1497 { 1159 {
1498 packet sl; 1160 packet sl;
1499 1161
1500 sl << "updspell " 1162 sl << "updspell "
1501 << uint8 (flags) 1163 << uint8 (flags)
1502 << uint32 (spell->count); 1164 << uint32 (spell->count);
1503 1165
1504 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1166 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1505 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1167 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1506 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1168 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1507 1169
1508 pl->ns->send_packet (sl); 1170 pl->ns->send_packet (sl);
1509 } 1171 }
1510 } 1172 }
1511 }
1512} 1173}
1513 1174
1514void 1175void
1515esrv_remove_spell (player *pl, object *spell) 1176esrv_remove_spell (player *pl, object *spell)
1516{ 1177{
1532 1193
1533/* appends the spell *spell to the Socklist we will send the data to. */ 1194/* appends the spell *spell to the Socklist we will send the data to. */
1534static void 1195static void
1535append_spell (player *pl, packet &sl, object *spell) 1196append_spell (player *pl, packet &sl, object *spell)
1536{ 1197{
1537 int i, skill = 0; 1198 int skill = 0;
1538 1199
1539 if (!(spell->name)) 1200 if (!(spell->name))
1540 { 1201 {
1541 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1202 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1542 return; 1203 return;
1543 } 1204 }
1544 1205
1545 /* store costs and damage in the object struct, to compare to later */ 1206 /* store costs and damage in the object struct, to compare to later */
1546 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1207 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1547 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1208 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1548 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1209 spell->cached_eat = casting_level (pl->ob, spell);
1549 1210
1550 /* figure out which skill it uses, if it uses one */ 1211 /* figure out which skill it uses, if it uses one */
1551 if (spell->skill) 1212 if (spell->skill)
1552 { 1213 if (object *tmp = pl->find_skill (spell->skill))
1553 for (i = 1; i < NUM_SKILLS; i++) 1214 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1554 if (!strcmp (spell->skill, skill_names[i]))
1555 {
1556 skill = i + CS_STAT_SKILLINFO;
1557 break;
1558 }
1559 }
1560 1215
1561 // spells better have a face 1216 // spells better have a face
1562 if (!spell->face) 1217 if (!spell->face)
1563 { 1218 {
1564 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1219 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1569 1224
1570 /* send the current values */ 1225 /* send the current values */
1571 sl << uint32 (spell->count) 1226 sl << uint32 (spell->count)
1572 << uint16 (spell->level) 1227 << uint16 (spell->level)
1573 << uint16 (spell->casting_time) 1228 << uint16 (spell->casting_time)
1574 << uint16 (spell->last_sp) 1229 << uint16 (spell->cached_sp)
1575 << uint16 (spell->last_grace) 1230 << uint16 (spell->cached_grace)
1576 << uint16 (spell->last_eat) 1231 << uint16 (spell->cached_eat)
1577 << uint8 (skill) 1232 << uint8 (skill)
1578 << uint32 (spell->path_attuned) 1233 << uint32 (spell->path_attuned)
1579 << uint32 (spell->face) 1234 << uint32 (spell->face)
1580 << data8 (spell->name) 1235 << data8 (spell->name);
1236
1237 if (pl->ns->monitor_spells < 2)
1581 << data16 (spell->msg); 1238 sl << data16 (spell->msg);
1582} 1239}
1583 1240
1584/** 1241/**
1585 * This tells the client to add the spell *ob, if *ob is NULL, then add 1242 * This tells the client to add the spell *ob, if *ob is NULL, then add
1586 * all spells in the player's inventory. 1243 * all spells in the player's inventory.
1587 */ 1244 */
1588void 1245void
1589esrv_add_spells (player *pl, object *spell) 1246esrv_add_spells (player *pl, object *spell)
1590{ 1247{
1601 1258
1602 if (!spell) 1259 if (!spell)
1603 { 1260 {
1604 for (spell = pl->ob->inv; spell; spell = spell->below) 1261 for (spell = pl->ob->inv; spell; spell = spell->below)
1605 { 1262 {
1606 /* were we to simply keep appending data here, we could exceed 1263 /* were we to simply keep appending data here, we could exceed
1607 * MAXSOCKBUF if the player has enough spells to add, we know that 1264 * MAXSOCKBUF if the player has enough spells to add, we know that
1608 * append_spells will always append 19 data bytes, plus 4 length 1265 * append_spells will always append 19 data bytes, plus 4 length
1609 * bytes and 3 strings (because that is the spec) so we need to 1266 * bytes and 3 strings (because that is the spec) so we need to
1610 * check that the length of those 3 strings, plus the 23 bytes, 1267 * check that the length of those 3 strings, plus the 23 bytes,
1611 * won't take us over the length limit for the socket, if it does, 1268 * won't take us over the length limit for the socket, if it does,
1612 * we need to send what we already have, and restart packet formation 1269 * we need to send what we already have, and restart packet formation
1613 */ 1270 */
1614 if (spell->type != SPELL) 1271 if (spell->type != SPELL)
1615 continue; 1272 continue;
1616 1273
1617 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1274 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1638 } 1295 }
1639 else 1296 else
1640 append_spell (pl, sl, spell); 1297 append_spell (pl, sl, spell);
1641 1298
1642 if (sl.length () > MAXSOCKBUF) 1299 if (sl.length () > MAXSOCKBUF)
1643 {
1644 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1300 cleanup ("buffer overflow in esrv_add_spells!");
1645 fatal (0);
1646 }
1647 1301
1648 /* finally, we can send the packet */ 1302 /* finally, we can send the packet */
1649 pl->ns->flush_fx (); 1303 pl->ns->flush_fx ();
1650 pl->ns->send_packet (sl); 1304 pl->ns->send_packet (sl);
1651} 1305}
1652 1306
1307//-GPL
1308

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines