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.150 by root, Mon Oct 12 14:00:59 2009 UTC vs.
Revision 1.195 by root, Sat Nov 17 23:40:05 2018 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5 * 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 6 * Copyright (©) 2001 Mark Wedel
6 * Copyright (©) 1992,2007 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 9 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 10 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 17 * GNU General Public License for more details.
17 * 18 *
18 * You should have received a copy of the Affero GNU General Public License 19 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 20 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 21 * <http://www.gnu.org/licenses/>.
21 * 22 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 23 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 24 */
25
26//+GPL
24 27
25/** 28/**
26 * \file 29 * \file
27 * Client handling. 30 * Client handling.
28 * 31 *
29 * \date 2003-12-02 32 * \date 2003-12-02
30 * 33 *
31 * This file implements all of the goo on the server side for handling 34 * This file implements all of the goo on the server side for handling
32 * clients. It's got a bunch of global variables for keeping track of 35 * clients. It's got a bunch of global variables for keeping track of
33 * each of the clients. 36 * each of the clients.
34 * 37 *
35 * Note: All functions that are used to process data from the client 38 * Note: All functions that are used to process data from the client
36 * have the prototype of (char *data, int datalen, int client_num). This 39 * have the prototype of (char *data, int datalen, int client_num). This
37 * way, we can use one dispatch table. 40 * way, we can use one dispatch table.
38 * 41 *
… …
42 45
43#include <global.h> 46#include <global.h>
44#include <sproto.h> 47#include <sproto.h>
45 48
46#include <living.h> 49#include <living.h>
47#include <commands.h>
48 50
49/* This block is basically taken from socket.c - I assume if it works there, 51/* This block is basically taken from socket.c - I assume if it works there,
50 * it should work here. 52 * it should work here.
51 */ 53 */
52#include <sys/types.h> 54#include <sys/types.h>
… …
64 * This table translates the attack numbers as used within the 66 * This table translates the attack numbers as used within the
65 * program to the value we use when sending STATS command to the 67 * program to the value we use when sending STATS command to the
66 * client. If a value is -1, then we don't send that to the 68 * client. If a value is -1, then we don't send that to the
67 * client. 69 * client.
68 */ 70 */
69short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS, 71static short atnr_cs_stat[NROFATTACKS] =
70 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC, 72{
71 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID, 73 CS_STAT_RES_PHYS,
72 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ , 74 CS_STAT_RES_MAG,
73 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 75 CS_STAT_RES_FIRE,
74 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD, 76 CS_STAT_RES_ELEC,
75 CS_STAT_RES_FEAR, -1 /* Cancellation */ , 77 CS_STAT_RES_COLD,
76 CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH, 78 CS_STAT_RES_CONF,
77 -1 /* Chaos */ , -1 /* Counterspell */ , 79 CS_STAT_RES_ACID,
78 -1 /* Godpower */ , CS_STAT_RES_HOLYWORD, 80 CS_STAT_RES_DRAIN,
81 -1 /* weaponmagic */,
82 CS_STAT_RES_GHOSTHIT,
83 CS_STAT_RES_POISON,
84 CS_STAT_RES_SLOW,
85 CS_STAT_RES_PARA,
86 CS_STAT_TURN_UNDEAD,
87 CS_STAT_RES_FEAR,
88 -1 /* Cancellation */,
89 CS_STAT_RES_DEPLETE,
90 CS_STAT_RES_DEATH,
91 -1 /* Chaos */,
92 -1 /* Counterspell */,
93 -1 /* Godpower */,
94 CS_STAT_RES_HOLYWORD,
79 CS_STAT_RES_BLIND, 95 CS_STAT_RES_BLIND,
80 -1, /* Internal */ 96 -1, /* Internal */
81 -1, /* life stealing */ 97 -1, /* life stealing */
82 -1 /* Disease - not fully done yet */ 98 -1 /* Disease - not fully done yet */
83}; 99};
… …
131 pl->ns->mapinfo_queue_clear (); 147 pl->ns->mapinfo_queue_clear ();
132 148
133 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 149 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
134 150
135 pl->ns->force_newmap = false; 151 pl->ns->force_newmap = false;
136
137 if (pl->ns->newmapcmd == 1)
138 pl->ns->send_packet ("newmap"); 152 pl->ns->send_packet ("newmap");
139
140 pl->ns->floorbox_reset (); 153 pl->ns->floorbox_reset ();
141} 154}
142 155
143static void 156static void
144send_map_info (player *pl) 157send_map_info (player *pl)
145{ 158{
146 client &socket = *pl->ns; 159 client &socket = *pl->ns;
147 object *ob = pl->observe; 160 object *ob = pl->viewpoint;
148 161
149 if (socket.mapinfocmd) 162 if (socket.mapinfocmd)
150 { 163 {
151 if (ob->map && ob->map->path[0]) 164 if (ob->map && ob->map->path)
152 { 165 {
153 int flags = 0; 166 int flags = 0;
154 167
168 // due to historical glitches, the bit ordering and map index ordering differs
155 if (ob->map->tile_path[0]) flags |= 1; 169 if (ob->map->tile_path [TILE_NORTH]) flags |= 0x01;
156 if (ob->map->tile_path[1]) flags |= 2; 170 if (ob->map->tile_path [TILE_EAST ]) flags |= 0x02;
157 if (ob->map->tile_path[2]) flags |= 4; 171 if (ob->map->tile_path [TILE_SOUTH]) flags |= 0x04;
158 if (ob->map->tile_path[3]) flags |= 8; 172 if (ob->map->tile_path [TILE_WEST ]) flags |= 0x08;
173 // these two are debatable
174 if (ob->map->tile_path [TILE_UP ]) flags |= 0x10;
175 if (ob->map->tile_path [TILE_DOWN ]) flags |= 0x20;
159 176
160 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s", 177 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
161 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, 178 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
162 ob->map->width, ob->map->height, &ob->map->path); 179 ob->map->width, ob->map->height, &ob->map->path);
163 } 180 }
… …
169/** check for map/region change and send new map data */ 186/** check for map/region change and send new map data */
170static void 187static void
171check_map_change (player *pl) 188check_map_change (player *pl)
172{ 189{
173 client &socket = *pl->ns; 190 client &socket = *pl->ns;
174 object *ob = pl->observe; 191 object *ob = pl->viewpoint;
175 192
176 region *reg = ob->region (); 193 region *reg = ob->region ();
177 if (socket.current_region != reg) 194 if (socket.current_region != reg)
178 { 195 {
179 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region)); 196 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
180 socket.current_region = reg; 197 socket.current_region = reg;
181 } 198 }
182 199
183 // first try to aovid a full newmap on tiled map scrolls 200 // first try to avoid a full newmap on tiled map scrolls
184 if (socket.current_map != ob->map && !socket.force_newmap) 201 if (socket.current_map != ob->map && !socket.force_newmap)
185 { 202 {
186 rv_vector rv; 203 rv_vector rv;
187 204
188 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0); 205 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
… …
218 socket.current_x = ob->x; 235 socket.current_x = ob->x;
219 socket.current_y = ob->y; 236 socket.current_y = ob->y;
220} 237}
221 238
222/** 239/**
240 * This sends the skill number to name mapping. We ignore
241 * the params - we always send the same info no matter what.
242 */
243static void
244send_skill_info (client *ns, char *params)
245{
246 packet sl;
247 sl << "replyinfo skill_info\n";
248
249 for (int i = 0; i < skillvec.size (); ++i)
250 sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name);
251
252 if (sl.length () > MAXSOCKBUF)
253 cleanup ("buffer overflow in send_skill_info!");
254
255 ns->send_packet (sl);
256}
257
258/**
259 * This sends the spell path to name mapping. We ignore
260 * the params - we always send the same info no matter what.
261 */
262static void
263send_spell_paths (client * ns, char *params)
264{
265 packet sl;
266
267 sl << "replyinfo spell_paths\n";
268
269 for (int i = 0; i < NRSPELLPATHS; i++)
270 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
271
272 if (sl.length () > MAXSOCKBUF)
273 cleanup ("buffer overflow in send_spell_paths!");
274
275 ns->send_packet (sl);
276}
277
278/**
223 * RequestInfo is sort of a meta command. There is some specific 279 * RequestInfo is sort of a meta command. There is some specific
224 * request of information, but we call other functions to provide 280 * request of information, but we call other functions to provide
225 * that information. 281 * that information.
282 * requestinfo is completely deprecated, use resource exti request
283 * and the fxix or http protocols.
226 */ 284 */
227void 285void
228RequestInfo (char *buf, int len, client *ns) 286RequestInfo (char *buf, int len, client *ns)
229{ 287{
230 char *params; 288 char *params;
… …
237 { 295 {
238 *params++ = 0; 296 *params++ = 0;
239 break; 297 break;
240 } 298 }
241 299
242 if (!strcmp (buf, "image_info"))
243 send_image_info (ns, params);
244 else if (!strcmp (buf, "image_sums"))
245 send_image_sums (ns, params);
246 else if (!strcmp (buf, "skill_info")) 300 if (!strcmp (buf, "skill_info"))
247 send_skill_info (ns, params); 301 send_skill_info (ns, params);
248 else if (!strcmp (buf, "spell_paths")) 302 else if (!strcmp (buf, "spell_paths"))
249 send_spell_paths (ns, params); 303 send_spell_paths (ns, params);
250 else 304 else
251 { 305 {
… …
267ExtiCmd (char *buf, int len, client *ns) 321ExtiCmd (char *buf, int len, client *ns)
268{ 322{
269 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 323 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
270} 324}
271 325
326//-GPL
327
272void 328void
273client::mapinfo_queue_clear () 329client::mapinfo_queue_clear ()
274{ 330{
275 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) 331 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
276 free (*i); 332 free (*i);
… …
283{ 339{
284 char *token = buf; 340 char *token = buf;
285 buf += strlen (buf) + 9; 341 buf += strlen (buf) + 9;
286 342
287 // initial map and its origin 343 // initial map and its origin
288 maptile *map = pl->observe->map; 344 maptile *map = pl->viewpoint->map;
289 int mapx = pl->ns->mapx / 2 - pl->observe->x; 345 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
290 int mapy = pl->ns->mapy / 2 - pl->observe->y; 346 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
291 int max_distance = 8; // limit maximum path length to something generous 347 int max_distance = 8; // limit maximum path length to something generous
292 348
293 while (*buf && map && max_distance) 349 while (*buf && map && max_distance)
294 { 350 {
295 int dir = *buf++ - '1'; 351 int dir = *buf++ - '1';
296 352
297 if (dir >= 0 && dir <= 3) 353 // due to historical glitches, the mapinfo index and tile index differs
354 static unsigned char dirmap [] = { TILE_NORTH, TILE_EAST, TILE_SOUTH, TILE_WEST, TILE_UP, TILE_DOWN };
355
356 // maybe we should only allow the four flat directions
357 if (IN_RANGE_EXC (dir, 0, array_length (dirmap)))
298 { 358 {
359 dir = dirmap [dir];
360
299 if (!map->tile_path [dir]) 361 if (!map->tile_path [dir])
300 map = 0; 362 map = 0;
301 else if (map->tile_available (dir, false)) 363 else if (map->tile_available (dir, false))
302 { 364 {
303 maptile *neigh = map->tile_map [dir]; 365 maptile *neigh = map->tile_map [dir];
… …
326 send_packet_printf ("mapinfo %s nomap", token); 388 send_packet_printf ("mapinfo %s nomap", token);
327 else 389 else
328 { 390 {
329 int flags = 0; 391 int flags = 0;
330 392
393 // due to historical glitches, the bit ordering and map index ordering differs
331 if (map->tile_path[0]) flags |= 1; 394 if (map->tile_path [TILE_NORTH]) flags |= 0x01;
332 if (map->tile_path[1]) flags |= 2; 395 if (map->tile_path [TILE_EAST ]) flags |= 0x02;
333 if (map->tile_path[2]) flags |= 4; 396 if (map->tile_path [TILE_SOUTH]) flags |= 0x04;
334 if (map->tile_path[3]) flags |= 8; 397 if (map->tile_path [TILE_WEST ]) flags |= 0x08;
398 // these two are debatable
399 if (map->tile_path [TILE_UP ]) flags |= 0x10;
400 if (map->tile_path [TILE_DOWN ]) flags |= 0x20;
335 401
336 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); 402 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
337 } 403 }
338 404
339 return 1; 405 return 1;
… …
400AddMeCmd (char *buf, int len, client *ns) 466AddMeCmd (char *buf, int len, client *ns)
401{ 467{
402 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 468 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
403} 469}
404 470
405/* 471//+GPL
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 472
468/** 473/**
469 * This handles the general commands from the client (ie, north, fire, cast, 474 * This handles the general commands from the client (ie, north, fire, cast,
470 * etc.) 475 * etc.)
471 */ 476 */
… …
484 return; 489 return;
485 490
486 buf++; 491 buf++;
487 } 492 }
488 493
489 execute_newserver_command (pl->ob, (char *) buf); 494 execute_newserver_command (pl->ob, (char *)buf);
490 495
491 /* Perhaps something better should be done with a left over count. 496 /* Perhaps something better should be done with a left over count.
492 * Cleaning up the input should probably be done first - all actions 497 * 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 498 * for the command that issued the count should be done before any other
494 * commands. 499 * commands.
495 */ 500 */
496 pl->count = 0; 501 pl->count = 0;
497}
498
499/**
500 * This handles the general commands from the client (ie, north, fire, cast,
501 * etc.). It is a lot like PlayerCmd above, but is called with the
502 * 'ncom' method which gives more information back to the client so it
503 * can throttle.
504 */
505void
506NewPlayerCmd (char *buf, int len, player *pl)
507{
508 if (len <= 6)
509 {
510 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
511 return;
512 }
513
514 uint16 cmdid = net_uint16 ((uint8 *)buf);
515 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
516
517 /* -1 is special - no repeat, but don't update */
518 if (repeat != -1)
519 pl->count = repeat;
520
521 buf += 6; //len -= 6;
522
523 execute_newserver_command (pl->ob, buf);
524
525 /* Perhaps something better should be done with a left over count.
526 * Cleaning up the input should probably be done first - all actions
527 * for the command that issued the count should be done before any other
528 * commands.
529 */
530 pl->count = 0;
531
532 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
533 int time = fabs (pl->ob->speed) < 0.001
534 ? time = MAX_TIME * 100
535 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
536
537 /* Send confirmation of command execution now */
538 packet sl ("comc");
539 sl << uint16 (cmdid) << uint32 (time);
540 pl->ns->send_packet (sl);
541} 502}
542 503
543/** This is a reply to a previous query. */ 504/** This is a reply to a previous query. */
544void 505void
545ReplyCmd (char *buf, int len, client *ns) 506ReplyCmd (char *buf, int len, client *ns)
… …
582 LOG (llevError, "Unknown input state: %d\n", ns->state); 543 LOG (llevError, "Unknown input state: %d\n", ns->state);
583 } 544 }
584} 545}
585 546
586/** 547/**
587 * Client tells its version. If there is a mismatch, we close the 548 * 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 */ 549 */
593void 550void
594VersionCmd (char *buf, int len, client * ns) 551VersionCmd (char *buf, int len, client *ns)
595{ 552{
596 if (!buf) 553 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} 554}
632 555
633/** sound related functions. */ 556/** sound related functions. */
634void 557void
635SetSound (char *buf, int len, client * ns) 558SetSound (char *buf, int len, client * ns)
… …
688static void 611static void
689rangetostring (player *pl, char *obuf) 612rangetostring (player *pl, char *obuf)
690{ 613{
691 dynbuf_text &buf = msg_dynbuf; buf.clear (); 614 dynbuf_text &buf = msg_dynbuf; buf.clear ();
692 615
616#if 0
617 // print ranged/chosen_skill etc. objects every call
618 printf ("%s %s => %s (%s)\n",
619 pl->ranged_ob ? &pl->ranged_ob->name : "-",
620 pl->combat_ob ? &pl->combat_ob->name : "-",
621 pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
622 pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
623 );
624#endif
625
693 if (pl->ranged_ob) 626 if (pl->ranged_ob)
694 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 627 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
695 628
696 if (pl->combat_ob) 629 if (pl->combat_ob)
697 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; 630 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
… …
742 * commands for now. 675 * commands for now.
743 */ 676 */
744void 677void
745esrv_update_stats (player *pl) 678esrv_update_stats (player *pl)
746{ 679{
747 char buf[MAX_BUF];
748 uint16 flags;
749
750 client *ns = pl->ns; 680 client *ns = pl->ns;
751 if (!ns) 681 if (!ns)
752 return; 682 return;
753 683
754 object *ob = pl->observe; 684 object *ob = pl->observe;
… …
771 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 701 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
772 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 702 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
773 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 703 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
774 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 704 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
775 705
776 for (int s = 0; s < NUM_SKILLS; s++) 706 for (int s = 0; s < CS_NUM_SKILLS; s++)
777 if (object *skill = opl->last_skill_ob [s]) 707 if (object *skill = opl->last_skill_ob [s])
778 if (skill->stats.exp != ns->last_skill_exp [s]) 708 if (skill->stats.exp != ns->last_skill_exp [s])
779 { 709 {
780 ns->last_skill_exp [s] = skill->stats.exp; 710 ns->last_skill_exp [s] = skill->stats.exp;
781 711
782 /* Always send along the level if exp changes. This is only 712 /* Always send along the level if exp changes. This is only
783 * 1 extra byte, but keeps processing simpler. 713 * 1 extra byte, but keeps processing simpler.
784 */ 714 */
785 sl << uint8 (s + CS_STAT_SKILLINFO) 715 sl << uint8 (CS_STAT_SKILLINFO + s)
786 << uint8 (skill->level) 716 << uint8 (skill->level)
787 << uint64 (skill->stats.exp); 717 << uint64 (skill->stats.exp);
788 } 718 }
789 719
790 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 720 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
791 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 721 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
792 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 722 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
793 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 723 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
794 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 724 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
795 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK); 725 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
796 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 726 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
797 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); 727 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
798 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 728 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
799 729
800 flags = 0; 730 int flags = (opl->fire_on ? SF_FIREON : 0)
801 731 | (opl->run_on ? SF_RUNON : 0);
802 if (opl->fire_on)
803 flags |= SF_FIREON;
804
805 if (opl->run_on)
806 flags |= SF_RUNON;
807 732
808 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 733 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
809 734
810 if (ns->sc_version < 1025)
811 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
812 else
813 for (int i = 0; i < NROFATTACKS; i++) 735 for (int i = 0; i < NROFATTACKS; i++)
814 {
815 /* Skip ones we won't send */ 736 /* Skip ones we won't send */
816 if (atnr_cs_stat[i] == -1) 737 if (atnr_cs_stat[i] >= 0)
817 continue;
818
819 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 738 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
820 }
821 739
822 if (pl->ns->monitor_spells) 740 if (pl->ns->monitor_spells)
823 { 741 {
824 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 742 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
825 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 743 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
826 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 744 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
827 } 745 }
828 746
747 char buf[MAX_BUF];
829 rangetostring (opl, buf); /* we want use the new fire & run system in new client */ 748 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
830 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 749 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
831 set_title (ob, buf); 750 set_title (ob, buf);
832 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 751 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
833 752
… …
927 846
928 /* Nothing changed */ 847 /* Nothing changed */
929 return 0; 848 return 0;
930} 849}
931 850
932// prefetch (and touch) all maps within a specific distancd
933static void
934prefetch_surrounding_maps (maptile *map, int distance)
935{
936 map->touch ();
937
938 if (--distance)
939 for (int dir = 4; --dir; )
940 if (const shstr &path = map->tile_path [dir])
941 if (maptile *&neigh = map->tile_map [dir])
942 prefetch_surrounding_maps (neigh, distance);
943 else
944 neigh = maptile::find_async (path, map);
945}
946
947// prefetch a generous area around the player
948static void
949prefetch_surrounding_maps (object *op)
950{
951 prefetch_surrounding_maps (op->map, 3);
952}
953
954/** 851/**
955 * Draws client map. 852 * Draws client map.
956 */ 853 */
957void 854void
958draw_client_map (player *pl) 855draw_client_map (player *pl)
959{ 856{
960 object *ob = pl->observe; 857 object *ob = pl->viewpoint;
961 if (!ob->active) 858 if (!pl->observe->active)
962 return; 859 return;
963 860
964 /* If player is just joining the game, he isn't here yet, so the map 861 /* If player is just joining the game, he isn't here yet, so the map
965 * can get swapped out. If so, don't try to send them a map. All will 862 * can get swapped out. If so, don't try to send them a map. All will
966 * be OK once they really log in. 863 * be OK once they really log in.
967 */ 864 */
968 if (!ob->map || ob->map->in_memory != MAP_ACTIVE) 865 if (!ob->map || ob->map->state != MAP_ACTIVE)
969 return; 866 return;
970 867
971 int startlen, oldlen; 868 int startlen, oldlen;
972 869
973 check_map_change (pl); 870 check_map_change (pl);
974 prefetch_surrounding_maps (pl->ob); 871 pl->ob->prefetch_surrounding_maps ();
975 872
976 /* do LOS after calls to update_position */ 873 /* do LOS after calls to update_position */
977 /* unfortunately, we need to udpate los when observing, currently */ 874 /* unfortunately, we need to udpate los when observing, currently */
978 if (pl->do_los || pl->observe != pl->ob) 875 if (pl->do_los || pl->viewpoint != pl->ob)
979 { 876 {
980 pl->do_los = 0; 877 pl->do_los = 0;
981 pl->update_los (); 878 pl->update_los ();
982 } 879 }
983 880
… …
1004 * look like. 901 * look like.
1005 */ 902 */
1006 903
1007 client &socket = *pl->ns; 904 client &socket = *pl->ns;
1008 905
1009 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 906 packet sl ("map1a");
1010 907
1011 startlen = sl.length (); 908 startlen = sl.length ();
1012 909
1013 int hx = socket.mapx / 2; 910 int hx = socket.mapx / 2;
1014 int hy = socket.mapy / 2; 911 int hy = socket.mapy / 2;
… …
1035 map_clearcell (&lastcell, -1); 932 map_clearcell (&lastcell, -1);
1036 } 933 }
1037 934
1038 continue; 935 continue;
1039 } 936 }
1040 937
1041 int d = pl->blocked_los_uc (dx, dy); 938 int d = pl->blocked_los_uc (dx, dy);
1042 939
1043 if (d > 3) 940 if (d > 3)
1044 { 941 {
1045 /* This block deals with spaces that are not visible for whatever 942 /* This block deals with spaces that are not visible for whatever
1046 * reason. Still may need to send the head for this space. 943 * reason. Still may need to send the head for this space.
1047 */ 944 */
1048 if (lastcell.count != -1 945 if (lastcell.count != -1
1049 || lastcell.faces[0] 946 || lastcell.faces[0]
1050 || lastcell.faces[1] 947 || lastcell.faces[1]
1051 || lastcell.faces[2] 948 || lastcell.faces[2]
1052 || lastcell.stat_hp 949 || lastcell.stat_hp
1053 || lastcell.flags 950 || lastcell.flags
1054 || lastcell.player) 951 || lastcell.player)
1055 sl << uint16 (mask); 952 sl << uint16 (mask);
1056 953
1057 /* properly clear a previously sent big face */ 954 /* properly clear a previously sent big face */
1058 map_clearcell (&lastcell, -1); 955 map_clearcell (&lastcell, -1);
… …
1106 { 1003 {
1107 if (op->stats.maxhp > op->stats.hp 1004 if (op->stats.maxhp > op->stats.hp
1108 && op->stats.maxhp > 0 1005 && op->stats.maxhp > 0
1109 && (op->type == PLAYER 1006 && (op->type == PLAYER
1110 || op->type == DOOR // does not work, have maxhp 0 1007 || op->type == DOOR // does not work, have maxhp 0
1111 || QUERY_FLAG (op, FLAG_MONSTER) 1008 || op->flag [FLAG_MONSTER]
1112 || QUERY_FLAG (op, FLAG_ALIVE) 1009 || op->flag [FLAG_ALIVE]
1113 || QUERY_FLAG (op, FLAG_GENERATOR))) 1010 || op->flag [FLAG_GENERATOR]))
1114 { 1011 {
1115 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1012 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1116 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge 1013 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1117 } 1014 }
1118 1015
… …
1214 socket.send_packet (sl); 1111 socket.send_packet (sl);
1215 socket.sent_scroll = 0; 1112 socket.sent_scroll = 0;
1216 } 1113 }
1217} 1114}
1218 1115
1219/*****************************************************************************/
1220/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1221/* a player. Of course, the client need to know the command to be able to */
1222/* manage it ! */
1223/*****************************************************************************/
1224void
1225send_plugin_custom_message (object *pl, char *buf)
1226{
1227 pl->contr->ns->send_packet (buf);
1228}
1229
1230/**
1231 * This sends the skill number to name mapping. We ignore
1232 * the params - we always send the same info no matter what.
1233 */
1234void
1235send_skill_info (client *ns, char *params)
1236{
1237 packet sl;
1238 sl << "replyinfo skill_info\n";
1239
1240 for (int i = 1; i < NUM_SKILLS; i++)
1241 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1242
1243 if (sl.length () > MAXSOCKBUF)
1244 {
1245 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1246 fatal (0);
1247 }
1248
1249 ns->send_packet (sl);
1250}
1251
1252/**
1253 * This sends the spell path to name mapping. We ignore
1254 * the params - we always send the same info no matter what.
1255 */
1256void
1257send_spell_paths (client * ns, char *params)
1258{
1259 packet sl;
1260
1261 sl << "replyinfo spell_paths\n";
1262
1263 for (int i = 0; i < NRSPELLPATHS; i++)
1264 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1265
1266 if (sl.length () > MAXSOCKBUF)
1267 {
1268 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1269 fatal (0);
1270 }
1271
1272 ns->send_packet (sl);
1273}
1274
1275/** 1116/**
1276 * This looks for any spells the player may have that have changed their stats. 1117 * This looks for any spells the player may have that have changed their stats.
1277 * it then sends an updspell packet for each spell that has changed in this way 1118 * it then sends an updspell packet for each spell that has changed in this way
1278 */ 1119 */
1279void 1120void
1280esrv_update_spells (player *pl) 1121esrv_update_spells (player *pl)
1281{ 1122{
1282 if (!pl->ns) 1123 if (!pl->ns)
1283 return; 1124 return;
1284 1125
1126 pl->ns->update_spells = false;
1127
1285 if (!pl->ns->monitor_spells) 1128 if (!pl->ns->monitor_spells)
1286 return; 1129 return;
1287 1130
1288 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1131 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1289 {
1290 if (spell->type == SPELL) 1132 if (spell->type == SPELL)
1291 { 1133 {
1292 int flags = 0; 1134 int flags = 0;
1135 int val;
1293 1136
1294 /* check if we need to update it */ 1137 /* check if we need to update it */
1295 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1138 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1139 if (spell->cached_sp != val)
1296 { 1140 {
1297 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1141 spell->cached_sp = val;
1298 flags |= UPD_SP_MANA; 1142 flags |= UPD_SP_MANA;
1299 } 1143 }
1300 1144
1301 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1145 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1146 if (spell->cached_grace != val)
1302 { 1147 {
1303 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1148 spell->cached_grace = val;
1304 flags |= UPD_SP_GRACE; 1149 flags |= UPD_SP_GRACE;
1305 } 1150 }
1306 1151
1307 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1152 val = casting_level (pl->ob, spell);
1153 if (spell->cached_eat != val)
1308 { 1154 {
1309 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1155 spell->cached_eat = val;
1310 flags |= UPD_SP_DAMAGE; 1156 flags |= UPD_SP_LEVEL;
1311 } 1157 }
1312 1158
1313 if (flags) 1159 if (flags)
1314 { 1160 {
1315 packet sl; 1161 packet sl;
1316 1162
1317 sl << "updspell " 1163 sl << "updspell "
1318 << uint8 (flags) 1164 << uint8 (flags)
1319 << uint32 (spell->count); 1165 << uint32 (spell->count);
1320 1166
1321 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); 1167 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1322 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); 1168 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1323 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); 1169 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1324 1170
1325 pl->ns->send_packet (sl); 1171 pl->ns->send_packet (sl);
1326 } 1172 }
1327 } 1173 }
1328 }
1329} 1174}
1330 1175
1331void 1176void
1332esrv_remove_spell (player *pl, object *spell) 1177esrv_remove_spell (player *pl, object *spell)
1333{ 1178{
… …
1349 1194
1350/* appends the spell *spell to the Socklist we will send the data to. */ 1195/* appends the spell *spell to the Socklist we will send the data to. */
1351static void 1196static void
1352append_spell (player *pl, packet &sl, object *spell) 1197append_spell (player *pl, packet &sl, object *spell)
1353{ 1198{
1354 int i, skill = 0; 1199 int skill = 0;
1355 1200
1356 if (!(spell->name)) 1201 if (!(spell->name))
1357 { 1202 {
1358 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1203 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1359 return; 1204 return;
1360 } 1205 }
1361 1206
1362 /* store costs and damage in the object struct, to compare to later */ 1207 /* store costs and damage in the object struct, to compare to later */
1363 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1208 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1364 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1209 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1365 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1210 spell->cached_eat = casting_level (pl->ob, spell);
1366 1211
1367 /* figure out which skill it uses, if it uses one */ 1212 /* figure out which skill it uses, if it uses one */
1368 if (spell->skill) 1213 if (spell->skill)
1369 if (object *tmp = pl->find_skill (spell->skill)) 1214 if (object *tmp = pl->find_skill (spell->skill))
1370 skill = tmp->subtype + CS_STAT_SKILLINFO; 1215 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1371 1216
1372 // spells better have a face 1217 // spells better have a face
1373 if (!spell->face) 1218 if (!spell->face)
1374 { 1219 {
1375 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1220 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
… …
1386 << uint16 (spell->cached_grace) 1231 << uint16 (spell->cached_grace)
1387 << uint16 (spell->cached_eat) 1232 << uint16 (spell->cached_eat)
1388 << uint8 (skill) 1233 << uint8 (skill)
1389 << uint32 (spell->path_attuned) 1234 << uint32 (spell->path_attuned)
1390 << uint32 (spell->face) 1235 << uint32 (spell->face)
1391 << data8 (spell->name) 1236 << data8 (spell->name);
1237
1238 if (pl->ns->monitor_spells < 2)
1392 << data16 (spell->msg); 1239 sl << data16 (spell->msg);
1393} 1240}
1394 1241
1395/** 1242/**
1396 * This tells the client to add the spell *ob, if *ob is NULL, then add 1243 * This tells the client to add the spell *ob, if *ob is NULL, then add
1397 * all spells in the player's inventory. 1244 * all spells in the player's inventory.
1398 */ 1245 */
1399void 1246void
1400esrv_add_spells (player *pl, object *spell) 1247esrv_add_spells (player *pl, object *spell)
1401{ 1248{
… …
1412 1259
1413 if (!spell) 1260 if (!spell)
1414 { 1261 {
1415 for (spell = pl->ob->inv; spell; spell = spell->below) 1262 for (spell = pl->ob->inv; spell; spell = spell->below)
1416 { 1263 {
1417 /* were we to simply keep appending data here, we could exceed 1264 /* were we to simply keep appending data here, we could exceed
1418 * MAXSOCKBUF if the player has enough spells to add, we know that 1265 * MAXSOCKBUF if the player has enough spells to add, we know that
1419 * append_spells will always append 19 data bytes, plus 4 length 1266 * append_spells will always append 19 data bytes, plus 4 length
1420 * bytes and 3 strings (because that is the spec) so we need to 1267 * bytes and 3 strings (because that is the spec) so we need to
1421 * check that the length of those 3 strings, plus the 23 bytes, 1268 * check that the length of those 3 strings, plus the 23 bytes,
1422 * won't take us over the length limit for the socket, if it does, 1269 * won't take us over the length limit for the socket, if it does,
1423 * we need to send what we already have, and restart packet formation 1270 * we need to send what we already have, and restart packet formation
1424 */ 1271 */
1425 if (spell->type != SPELL) 1272 if (spell->type != SPELL)
1426 continue; 1273 continue;
1427 1274
1428 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1275 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
… …
1449 } 1296 }
1450 else 1297 else
1451 append_spell (pl, sl, spell); 1298 append_spell (pl, sl, spell);
1452 1299
1453 if (sl.length () > MAXSOCKBUF) 1300 if (sl.length () > MAXSOCKBUF)
1454 {
1455 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1301 cleanup ("buffer overflow in esrv_add_spells!");
1456 fatal (0);
1457 }
1458 1302
1459 /* finally, we can send the packet */ 1303 /* finally, we can send the packet */
1460 pl->ns->flush_fx (); 1304 pl->ns->flush_fx ();
1461 pl->ns->send_packet (sl); 1305 pl->ns->send_packet (sl);
1462} 1306}
1463 1307
1308//-GPL
1309

Diff Legend

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