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.130 by root, Tue May 20 03:14:19 2008 UTC vs.
Revision 1.183 by root, Sat May 7 20:03:28 2011 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 (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 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 * Deliantra 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 <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
24
25//+GPL
23 26
24/** 27/**
25 * \file 28 * \file
26 * Client handling. 29 * Client handling.
27 * 30 *
… …
41 44
42#include <global.h> 45#include <global.h>
43#include <sproto.h> 46#include <sproto.h>
44 47
45#include <living.h> 48#include <living.h>
46#include <commands.h>
47 49
48/* This block is basically taken from socket.c - I assume if it works there, 50/* This block is basically taken from socket.c - I assume if it works there,
49 * it should work here. 51 * it should work here.
50 */ 52 */
51#include <sys/types.h> 53#include <sys/types.h>
… …
63 * This table translates the attack numbers as used within the 65 * This table translates the attack numbers as used within the
64 * program to the value we use when sending STATS command to the 66 * program to the value we use when sending STATS command to the
65 * client. If a value is -1, then we don't send that to the 67 * client. If a value is -1, then we don't send that to the
66 * client. 68 * client.
67 */ 69 */
68short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS, 70static short atnr_cs_stat[NROFATTACKS] =
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 }
152 198
153 // first try to aovid a full newmap on tiled map scrolls 199 // first try to aovid a full newmap on tiled map scrolls
154 if (socket.current_map != ob->map) 200 if (socket.current_map != ob->map && !socket.force_newmap)
155 { 201 {
156 rv_vector rv; 202 rv_vector rv;
157 203
158 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0); 204 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
159 205
… …
164 socket.current_x = ob->x; 210 socket.current_x = ob->x;
165 socket.current_y = ob->y; 211 socket.current_y = ob->y;
166 212
167 socket_map_scroll (&socket, rv.distance_x, rv.distance_y); 213 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
168 socket.floorbox_reset (); 214 socket.floorbox_reset ();
215 send_map_info (pl);
169 } 216 }
170 } 217 }
171 218
172 if (socket.current_map != ob->map || socket.force_newmap) 219 if (socket.current_map != ob->map || socket.force_newmap)
173 { 220 {
174 clear_map (pl); 221 clear_map (pl);
175 socket.current_map = ob->map; 222 socket.current_map = ob->map;
176 223 send_map_info (pl);
177 if (socket.mapinfocmd)
178 {
179 if (ob->map && ob->map->path[0])
180 {
181 int flags = 0;
182
183 if (ob->map->tile_path[0]) flags |= 1;
184 if (ob->map->tile_path[1]) flags |= 2;
185 if (ob->map->tile_path[2]) flags |= 4;
186 if (ob->map->tile_path[3]) flags |= 8;
187
188 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
189 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
190 ob->map->width, ob->map->height, &ob->map->path);
191 }
192 else
193 socket.send_packet ("mapinfo current");
194 }
195 } 224 }
196 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)
197 { 226 {
198 int dx = ob->x - socket.current_x; 227 int dx = ob->x - socket.current_x;
199 int dy = ob->y - socket.current_y; 228 int dy = ob->y - socket.current_y;
200 229
201 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
202 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
203 else
204 {
205 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);
206 socket.floorbox_reset (); 231 socket.floorbox_reset ();
207 }
208 } 232 }
209 233
210 socket.current_x = ob->x; 234 socket.current_x = ob->x;
211 socket.current_y = ob->y; 235 socket.current_y = ob->y;
236}
212 237
213 region *reg = ob->region (); 238/**
214 if (socket.current_region != reg) 239 * This sends the skill number to name mapping. We ignore
215 { 240 * the params - we always send the same info no matter what.
216 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region)); 241 */
217 socket.current_region = reg; 242static void
218 } 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);
219} 275}
220 276
221/** 277/**
222 * RequestInfo is sort of a meta command. There is some specific 278 * RequestInfo is sort of a meta command. There is some specific
223 * request of information, but we call other functions to provide 279 * request of information, but we call other functions to provide
… …
236 { 292 {
237 *params++ = 0; 293 *params++ = 0;
238 break; 294 break;
239 } 295 }
240 296
241 if (!strcmp (buf, "image_info"))
242 send_image_info (ns, params);
243 else if (!strcmp (buf, "image_sums"))
244 send_image_sums (ns, params);
245 else if (!strcmp (buf, "skill_info")) 297 if (!strcmp (buf, "skill_info"))
246 send_skill_info (ns, params); 298 send_skill_info (ns, params);
247 else if (!strcmp (buf, "spell_paths")) 299 else if (!strcmp (buf, "spell_paths"))
248 send_spell_paths (ns, params); 300 send_spell_paths (ns, params);
249 else 301 else
250 { 302 {
… …
266ExtiCmd (char *buf, int len, client *ns) 318ExtiCmd (char *buf, int len, client *ns)
267{ 319{
268 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 320 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
269} 321}
270 322
323//-GPL
324
271void 325void
272client::mapinfo_queue_clear () 326client::mapinfo_queue_clear ()
273{ 327{
274 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) 328 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
275 free (*i); 329 free (*i);
… …
282{ 336{
283 char *token = buf; 337 char *token = buf;
284 buf += strlen (buf) + 9; 338 buf += strlen (buf) + 9;
285 339
286 // initial map and its origin 340 // initial map and its origin
287 maptile *map = pl->observe->map; 341 maptile *map = pl->viewpoint->map;
288 int mapx = pl->ns->mapx / 2 - pl->observe->x; 342 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
289 int mapy = pl->ns->mapy / 2 - pl->observe->y; 343 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
290 int max_distance = 8; // limit maximum path length to something generous 344 int max_distance = 8; // limit maximum path length to something generous
291 345
292 while (*buf && map && max_distance) 346 while (*buf && map && max_distance)
293 { 347 {
294 int dir = *buf++ - '1'; 348 int dir = *buf++ - '1';
295 349
296 if (dir >= 0 && dir <= 3) 350 // due to historical glitches, the mapinfo index and tile index differs
351 static unsigned char dirmap [] = { TILE_NORTH, TILE_EAST, TILE_SOUTH, TILE_WEST, TILE_UP, TILE_DOWN };
352
353 // maybe we should only allow the four flat directions
354 if (dir >= 0 && dir < array_length (dirmap))
297 { 355 {
356 dir = dirmap [dir];
357
298 if (!map->tile_path [dir]) 358 if (!map->tile_path [dir])
299 map = 0; 359 map = 0;
300 else if (map->tile_available (dir, false)) 360 else if (map->tile_available (dir, false))
301 { 361 {
302 maptile *neigh = map->tile_map [dir]; 362 maptile *neigh = map->tile_map [dir];
… …
325 send_packet_printf ("mapinfo %s nomap", token); 385 send_packet_printf ("mapinfo %s nomap", token);
326 else 386 else
327 { 387 {
328 int flags = 0; 388 int flags = 0;
329 389
390 // due to historical glitches, the bit ordering and map index ordering differs
330 if (map->tile_path[0]) flags |= 1; 391 if (map->tile_path[TILE_NORTH]) flags |= 0x01;
331 if (map->tile_path[1]) flags |= 2; 392 if (map->tile_path[TILE_EAST ]) flags |= 0x02;
332 if (map->tile_path[2]) flags |= 4; 393 if (map->tile_path[TILE_SOUTH]) flags |= 0x04;
333 if (map->tile_path[3]) flags |= 8; 394 if (map->tile_path[TILE_WEST ]) flags |= 0x08;
395 // these two are debatable
396 if (map->tile_path[TILE_UP ]) flags |= 0x10;
397 if (map->tile_path[TILE_DOWN ]) flags |= 0x20;
334 398
335 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); 399 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
336 } 400 }
337 401
338 return 1; 402 return 1;
… …
399AddMeCmd (char *buf, int len, client *ns) 463AddMeCmd (char *buf, int len, client *ns)
400{ 464{
401 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 465 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
402} 466}
403 467
404/** Reply to ExtendedInfos command */ 468//+GPL
405void
406ToggleExtendedInfos (char *buf, int len, client * ns)
407{
408 char cmdback[MAX_BUF];
409 char command[50];
410 int info, nextinfo;
411
412 cmdback[0] = '\0';
413 nextinfo = 0;
414
415 while (1)
416 {
417 /* 1. Extract an info */
418 info = nextinfo;
419
420 while ((info < len) && (buf[info] == ' '))
421 info++;
422
423 if (info >= len)
424 break;
425
426 nextinfo = info + 1;
427
428 while ((nextinfo < len) && (buf[nextinfo] != ' '))
429 nextinfo++;
430
431 if (nextinfo - info >= 49) /*Erroneous info asked */
432 continue;
433
434 strncpy (command, &(buf[info]), nextinfo - info);
435
436 /* 2. Interpret info */
437 if (!strcmp ("smooth", command))
438 /* Toggle smoothing */
439 ns->EMI_smooth = !ns->EMI_smooth;
440 else
441 /*bad value */;
442
443 /*3. Next info */
444 }
445
446 strcpy (cmdback, "ExtendedInfoSet");
447
448 if (ns->EMI_smooth)
449 {
450 strcat (cmdback, " ");
451 strcat (cmdback, "smoothing");
452 }
453
454 ns->send_packet (cmdback);
455}
456
457/*
458#define MSG_TYPE_BOOK 1
459#define MSG_TYPE_CARD 2
460#define MSG_TYPE_PAPER 3
461#define MSG_TYPE_SIGN 4
462#define MSG_TYPE_MONUMENT 5
463#define MSG_TYPE_SCRIPTED_DIALOG 6*/
464
465/** Reply to ExtendedInfos command */
466void
467ToggleExtendedText (char *buf, int len, client * ns)
468{
469 char cmdback[MAX_BUF];
470 char temp[10];
471 char command[50];
472 int info, nextinfo, i, flag;
473
474 cmdback[0] = '\0';
475
476 nextinfo = 0;
477 while (1)
478 {
479 /* 1. Extract an info */
480 info = nextinfo;
481
482 while ((info < len) && (buf[info] == ' '))
483 info++;
484
485 if (info >= len)
486 break;
487
488 nextinfo = info + 1;
489
490 while ((nextinfo < len) && (buf[nextinfo] != ' '))
491 nextinfo++;
492
493 if (nextinfo - info >= 49) /*Erroneous info asked */
494 continue;
495
496 strncpy (command, &(buf[info]), nextinfo - info);
497 command[nextinfo - info] = '\0';
498 /* 2. Interpret info */
499 i = sscanf (command, "%d", &flag);
500
501 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
502 ns->supported_readables |= (1 << flag);
503 /*3. Next info */
504 }
505
506 /* Send resulting state */
507 strcpy (cmdback, "ExtendedTextSet");
508
509 for (i = 0; i <= MSG_TYPE_LAST; i++)
510 if (ns->supported_readables & (1 << i))
511 {
512 strcat (cmdback, " ");
513 snprintf (temp, sizeof (temp), "%d", i);
514 strcat (cmdback, temp);
515 }
516
517 ns->send_packet (cmdback);
518}
519 469
520/** 470/**
521 * This handles the general commands from the client (ie, north, fire, cast, 471 * This handles the general commands from the client (ie, north, fire, cast,
522 * etc.) 472 * etc.)
523 */ 473 */
… …
536 return; 486 return;
537 487
538 buf++; 488 buf++;
539 } 489 }
540 490
541 execute_newserver_command (pl->ob, (char *) buf); 491 execute_newserver_command (pl->ob, (char *)buf);
542 492
543 /* Perhaps something better should be done with a left over count. 493 /* Perhaps something better should be done with a left over count.
544 * Cleaning up the input should probably be done first - all actions 494 * Cleaning up the input should probably be done first - all actions
545 * for the command that issued the count should be done before any other 495 * for the command that issued the count should be done before any other
546 * commands. 496 * commands.
… …
580 * commands. 530 * commands.
581 */ 531 */
582 pl->count = 0; 532 pl->count = 0;
583 533
584 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 534 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
585 int time = fabs (pl->ob->speed) < 0.001 535 int time = pl->ob->has_active_speed ()
586 ? time = MAX_TIME * 100
587 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 536 ? (int) (MAX_TIME / pl->ob->speed)
537 : MAX_TIME * 100;
588 538
589 /* Send confirmation of command execution now */ 539 /* Send confirmation of command execution now */
590 packet sl ("comc"); 540 packet sl ("comc");
591 sl << uint16 (cmdid) << uint32 (time); 541 sl << uint16 (cmdid) << uint32 (time);
592 pl->ns->send_packet (sl); 542 pl->ns->send_packet (sl);
… …
634 LOG (llevError, "Unknown input state: %d\n", ns->state); 584 LOG (llevError, "Unknown input state: %d\n", ns->state);
635 } 585 }
636} 586}
637 587
638/** 588/**
639 * Client tells its version. If there is a mismatch, we close the 589 * Client tells its version info.
640 * socket. In real life, all we should care about is the client having
641 * something older than the server. If we assume the client will be
642 * backwards compatible, having it be a later version should not be a
643 * problem.
644 */ 590 */
645void 591void
646VersionCmd (char *buf, int len, client * ns) 592VersionCmd (char *buf, int len, client *ns)
647{ 593{
648 if (!buf) 594 INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
649 {
650 LOG (llevError, "CS: received corrupted version command\n");
651 return;
652 }
653
654 ns->cs_version = atoi (buf);
655 ns->sc_version = ns->cs_version;
656
657 LOG (llevDebug, "connection from client <%s>\n", buf);
658
659 //TODO: should log here just for statistics
660
661 //if (VERSION_CS != ns->cs_version)
662 // unchecked;
663
664 char *cp = strchr (buf + 1, ' ');
665 if (!cp)
666 return;
667
668 ns->sc_version = atoi (cp);
669
670 //if (VERSION_SC != ns->sc_version)
671 // unchecked;
672
673 cp = strchr (cp + 1, ' ');
674
675 if (cp)
676 {
677 ns->version = cp + 1;
678
679 if (ns->sc_version < 1026)
680 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
681 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
682 }
683} 595}
684 596
685/** sound related functions. */ 597/** sound related functions. */
686void 598void
687SetSound (char *buf, int len, client * ns) 599SetSound (char *buf, int len, client * ns)
… …
738 * Get player's current range attack in obuf. 650 * Get player's current range attack in obuf.
739 */ 651 */
740static void 652static void
741rangetostring (player *pl, char *obuf) 653rangetostring (player *pl, char *obuf)
742{ 654{
743 dynbuf_text buf; 655 dynbuf_text &buf = msg_dynbuf; buf.clear ();
656
657#if 0
658 // print ranged/chosen_skill etc. objects every call
659 printf ("%s %s => %s (%s)\n",
660 pl->ranged_ob ? &pl->ranged_ob->name : "-",
661 pl->combat_ob ? &pl->combat_ob->name : "-",
662 pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
663 pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
664 );
665#endif
744 666
745 if (pl->ranged_ob) 667 if (pl->ranged_ob)
746 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 668 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
747 669
748 if (pl->combat_ob) 670 if (pl->combat_ob)
… …
794 * commands for now. 716 * commands for now.
795 */ 717 */
796void 718void
797esrv_update_stats (player *pl) 719esrv_update_stats (player *pl)
798{ 720{
799 char buf[MAX_BUF];
800 uint16 flags;
801
802 client *ns = pl->ns; 721 client *ns = pl->ns;
803 if (!ns) 722 if (!ns)
804 return; 723 return;
805 724
806 object *ob = pl->observe; 725 object *ob = pl->observe;
… …
823 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 742 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
824 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 743 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
825 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 744 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
826 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 745 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
827 746
828 for (int s = 0; s < NUM_SKILLS; s++) 747 for (int s = 0; s < CS_NUM_SKILLS; s++)
829 if (object *skill = opl->last_skill_ob[s]) 748 if (object *skill = opl->last_skill_ob [s])
830 if (skill->stats.exp != ns->last_skill_exp [s]) 749 if (skill->stats.exp != ns->last_skill_exp [s])
831 { 750 {
832 ns->last_skill_exp [s] = skill->stats.exp; 751 ns->last_skill_exp [s] = skill->stats.exp;
833 752
834 /* Always send along the level if exp changes. This is only 753 /* Always send along the level if exp changes. This is only
835 * 1 extra byte, but keeps processing simpler. 754 * 1 extra byte, but keeps processing simpler.
836 */ 755 */
837 sl << uint8 (s + CS_STAT_SKILLINFO) 756 sl << uint8 (CS_STAT_SKILLINFO + s)
838 << uint8 (skill->level) 757 << uint8 (skill->level)
839 << uint64 (skill->stats.exp); 758 << uint64 (skill->stats.exp);
840 } 759 }
841 760
842 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 761 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
843 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 762 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
844 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 763 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
845 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 764 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
846 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 765 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
847 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK); 766 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
848 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 767 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
849 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); 768 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
850 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 769 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
851 770
852 flags = 0; 771 int flags = (opl->fire_on ? SF_FIREON : 0)
853 772 | (opl->run_on ? SF_RUNON : 0);
854 if (opl->fire_on)
855 flags |= SF_FIREON;
856
857 if (opl->run_on)
858 flags |= SF_RUNON;
859 773
860 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 774 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
861 775
862 if (ns->sc_version < 1025)
863 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
864 else
865 for (int i = 0; i < NROFATTACKS; i++) 776 for (int i = 0; i < NROFATTACKS; i++)
866 {
867 /* Skip ones we won't send */ 777 /* Skip ones we won't send */
868 if (atnr_cs_stat[i] == -1) 778 if (atnr_cs_stat[i] >= 0)
869 continue;
870
871 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 779 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
872 }
873 780
874 if (pl->ns->monitor_spells) 781 if (pl->ns->monitor_spells)
875 { 782 {
876 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 783 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
877 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 784 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
878 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 785 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
879 } 786 }
880 787
788 char buf[MAX_BUF];
881 rangetostring (opl, buf); /* we want use the new fire & run system in new client */ 789 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
882 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 790 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
883 set_title (ob, buf); 791 set_title (ob, buf);
884 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 792 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
885 793
… …
903 << uint32 (pl->ob->face) 811 << uint32 (pl->ob->face)
904 << data8 (pl->ob->name); 812 << data8 (pl->ob->name);
905 813
906 pl->ns->last_weight = weight; 814 pl->ns->last_weight = weight;
907 pl->ns->send_packet (sl); 815 pl->ns->send_packet (sl);
908 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
909} 816}
910 817
911/****************************************************************************** 818/******************************************************************************
912 * 819 *
913 * Start of map related commands. 820 * Start of map related commands.
… …
980 887
981 /* Nothing changed */ 888 /* Nothing changed */
982 return 0; 889 return 0;
983} 890}
984 891
985/** 892//-GPL
986 * Returns the size of a data for a map square as returned by
987 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
988 * available.
989 */
990int
991getExtendedMapInfoSize (client * ns)
992{
993 int result = 0;
994 893
995 if (ns->ext_mapinfos) 894// prefetch some flat area around the player
996 {
997 if (ns->EMI_smooth)
998 result += 1; /*One byte for smoothlevel */
999 }
1000
1001 return result;
1002}
1003
1004// prefetch (and touch) all maps within a specific distancd
1005static void 895static void
1006prefetch_surrounding_maps (maptile *map, int distance) 896prefetch_surrounding_area (object *op, maptile *map, int range)
1007{ 897{
1008 map->last_access = runtime; 898 for (maprect *rect = map->split_to_tiles (mapwalk_buf,
1009 899 op->x - range , op->y - range ,
1010 if (--distance) 900 op->x + range + 1, op->y + range + 1);
1011 for (int dir = 4; --dir; ) 901 rect->m;
1012 if (const shstr &path = map->tile_path [dir]) 902 ++rect)
1013 if (maptile *&neigh = map->tile_map [dir]) 903 {
1014 prefetch_surrounding_maps (neigh, distance); 904 rect->m->touch ();
1015 else 905 rect->m->activate ();
1016 neigh = maptile::find_async (path, map); 906 }
1017} 907}
1018 908
1019// prefetch a generous area around the player 909// prefetch a generous area around the player, also up and down
1020static void 910void
1021prefetch_surrounding_maps (object *op) 911object::prefetch_surrounding_maps ()
1022{ 912{
1023 prefetch_surrounding_maps (op->map, 3); 913 prefetch_surrounding_area (this, map, 40);
914
915 if (maptile *m = map->tile_available (TILE_DOWN))
916 prefetch_surrounding_area (this, m, 20);
917
918 if (maptile *m = map->tile_available (TILE_UP))
919 prefetch_surrounding_area (this, m, 20);
1024} 920}
921
922//+GPL
1025 923
1026/** 924/**
1027 * Draws client map. 925 * Draws client map.
1028 */ 926 */
1029void 927void
1030draw_client_map (player *pl) 928draw_client_map (player *pl)
1031{ 929{
1032 object *ob = pl->observe; 930 object *ob = pl->viewpoint;
1033 if (!ob->active) 931 if (!pl->observe->active)
1034 return; 932 return;
1035
1036 maptile *plmap = ob->map;
1037 933
1038 /* If player is just joining the game, he isn't here yet, so the map 934 /* If player is just joining the game, he isn't here yet, so the map
1039 * can get swapped out. If so, don't try to send them a map. All will 935 * can get swapped out. If so, don't try to send them a map. All will
1040 * be OK once they really log in. 936 * be OK once they really log in.
1041 */ 937 */
1042 if (!plmap || plmap->in_memory != MAP_ACTIVE) 938 if (!ob->map || ob->map->state != MAP_ACTIVE)
1043 return; 939 return;
1044 940
1045 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1046 int estartlen, eoldlen; 941 int startlen, oldlen;
1047 uint8 eentrysize;
1048 uint16 ewhatstart, ewhatflag;
1049 uint8 extendedinfos;
1050 942
1051 check_map_change (pl); 943 check_map_change (pl);
1052 prefetch_surrounding_maps (pl->ob); 944 pl->ob->prefetch_surrounding_maps ();
1053 945
1054 /* do LOS after calls to update_position */ 946 /* do LOS after calls to update_position */
1055 if (ob != pl->ob) 947 /* unfortunately, we need to udpate los when observing, currently */
1056 clear_los (pl); 948 if (pl->do_los || pl->viewpoint != pl->ob)
1057 else if (pl->do_los)
1058 { 949 {
1059 update_los (ob);
1060 pl->do_los = 0; 950 pl->do_los = 0;
951 pl->update_los ();
1061 } 952 }
1062 953
1063 /** 954 /**
1064 * This function uses the new map1 protocol command to send the map 955 * This function uses the new map1 protocol command to send the map
1065 * to the client. It is necessary because the old map command supports 956 * to the client. It is necessary because the old map command supports
… …
1083 * look like. 974 * look like.
1084 */ 975 */
1085 976
1086 client &socket = *pl->ns; 977 client &socket = *pl->ns;
1087 978
1088 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 979 packet sl ("map1a");
1089 packet esl;
1090 980
1091 startlen = sl.length (); 981 startlen = sl.length ();
1092 982
1093 /*Extendedmapinfo structure initialisation */ 983 int hx = socket.mapx / 2;
1094 if (socket.ext_mapinfos) 984 int hy = socket.mapy / 2;
1095 {
1096 extendedinfos = EMI_NOREDRAW;
1097 985
1098 if (socket.EMI_smooth) 986 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1099 extendedinfos |= EMI_SMOOTH; 987 int ax = dx + hx;
988 int ay = dy + hy;
1100 989
1101 ewhatstart = esl.length (); 990 int mask = (ax << 10) | (ay << 4);
1102 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 991 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1103 could need to be taken away */
1104 eentrysize = getExtendedMapInfoSize (&socket);
1105 esl << "mapextended "
1106 << uint8 (extendedinfos)
1107 << uint8 (eentrysize);
1108 992
1109 estartlen = esl.length (); 993 /* If the coordinates are not valid, or it is too dark to see,
1110 } 994 * we tell the client as such
1111
1112 /* x,y are the real map locations. ax, ay are viewport relative
1113 * locations.
1114 */ 995 */
1115 ay = 0; 996 if (!m)
1116
1117 /* We could do this logic as conditionals in the if statement,
1118 * but that started to get a bit messy to look at.
1119 */
1120 max_x = ob->x + (socket.mapx + 1) / 2;
1121 max_y = ob->y + (socket.mapy + 1) / 2;
1122
1123 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1124 { 997 {
1125 sint16 nx, ny; 998 /* space is out of map. Update space and clear values
1126 maptile *m = 0; 999 * if this hasn't already been done. If the space is out
1127 1000 * of the map, it shouldn't have a head.
1128 ax = 0; 1001 */
1129 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) 1002 if (lastcell.count != -1)
1130 { 1003 {
1131 // check to see if we can simply go one right quickly 1004 sl << uint16 (mask);
1005 map_clearcell (&lastcell, -1);
1132 ++nx; 1006 }
1133 if (m && nx >= m->width) 1007
1008 continue;
1009 }
1010
1011 int d = pl->blocked_los_uc (dx, dy);
1012
1013 if (d > 3)
1014 {
1015 /* This block deals with spaces that are not visible for whatever
1016 * reason. Still may need to send the head for this space.
1017 */
1018 if (lastcell.count != -1
1019 || lastcell.faces[0]
1020 || lastcell.faces[1]
1021 || lastcell.faces[2]
1022 || lastcell.stat_hp
1023 || lastcell.flags
1024 || lastcell.player)
1025 sl << uint16 (mask);
1026
1027 /* properly clear a previously sent big face */
1028 map_clearcell (&lastcell, -1);
1029 }
1030 else
1031 {
1032 /* In this block, the space is visible.
1033 */
1034
1035 /* Rather than try to figure out what everything that we might
1036 * need to send is, then form the packet after that,
1037 * we presume that we will in fact form a packet, and update
1038 * the bits by what we do actually send. If we send nothing,
1039 * we just back out sl.length () to the old value, and no harm
1040 * is done.
1041 * I think this is simpler than doing a bunch of checks to see
1042 * what if anything we need to send, setting the bits, then
1043 * doing those checks again to add the real data.
1044 */
1045 oldlen = sl.length ();
1046
1047 sl << uint16 (mask);
1048
1049 unsigned char dummy;
1050 unsigned char *last_ext = &dummy;
1051
1052 /* Darkness changed */
1053 if (lastcell.count != d)
1054 {
1134 m = 0; 1055 mask |= 0x8;
1135 1056
1136 if (!m) 1057 *last_ext |= 0x80;
1058 last_ext = &sl[sl.length ()];
1059 sl << uint8 (d);
1060 }
1061
1062 lastcell.count = d;
1063
1064 mapspace &ms = m->at (nx, ny);
1065 ms.update ();
1066
1067 // extmap handling
1068 uint8 stat_hp = 0;
1069 uint8 stat_width = 0;
1070 uint8 flags = 0;
1071 tag_t player = 0;
1072
1073 // send hp information, if applicable
1074 if (object *op = ms.faces_obj [0])
1075 if (op->is_head () && !op->invisible)
1137 { 1076 {
1138 nx = x; ny = y; m = plmap; 1077 if (op->stats.maxhp > op->stats.hp
1139 1078 && op->stats.maxhp > 0
1140 if (xy_normalise (m, nx, ny)) 1079 && (op->type == PLAYER
1141 m->touch (); 1080 || op->type == DOOR // does not work, have maxhp 0
1142 else 1081 || op->flag [FLAG_MONSTER]
1082 || op->flag [FLAG_ALIVE]
1083 || op->flag [FLAG_GENERATOR]))
1143 m = 0; 1084 {
1085 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1086 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1087 }
1088
1089 if (expect_false (op->has_dialogue ()))
1090 flags |= 1;
1091
1092 if (expect_false (op->type == PLAYER))
1093 player = op == ob ? pl->ob->count
1094 : op == pl->ob ? ob->count
1095 : op->count;
1144 } 1096 }
1145 1097
1146 int emask, mask; 1098 if (expect_false (lastcell.stat_hp != stat_hp))
1147 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1148
1149 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1150
1151 /* If the coordinates are not valid, or it is too dark to see,
1152 * we tell the client as such
1153 */
1154 if (!m)
1155 { 1099 {
1156 /* space is out of map. Update space and clear values 1100 lastcell.stat_hp = stat_hp;
1157 * if this hasn't already been done. If the space is out 1101
1158 * of the map, it shouldn't have a head 1102 mask |= 0x8;
1159 */ 1103 *last_ext |= 0x80;
1160 if (lastcell.count != -1) 1104 last_ext = &sl[sl.length ()];
1105
1106 sl << uint8 (5) << uint8 (stat_hp);
1107
1108 if (stat_width > 1)
1161 { 1109 {
1162 sl << uint16 (mask);
1163 map_clearcell (&lastcell, -1);
1164 }
1165
1166 continue;
1167 }
1168
1169 int d = pl->blocked_los[ax][ay];
1170
1171 if (d > 3)
1172 {
1173
1174 int need_send = 0, count;
1175
1176 /* This block deals with spaces that are not visible for whatever
1177 * reason. Still may need to send the head for this space.
1178 */
1179
1180 oldlen = sl.length ();
1181
1182 sl << uint16 (mask);
1183
1184 if (lastcell.count != -1)
1185 need_send = 1;
1186
1187 count = -1;
1188
1189 /* properly clear a previously sent big face */
1190 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1191 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1192 need_send = 1;
1193
1194 map_clearcell (&lastcell, count);
1195
1196 if ((mask & 0xf) || need_send)
1197 sl[oldlen + 1] = mask & 0xff;
1198 else
1199 sl.reset (oldlen);
1200 }
1201 else
1202 {
1203 /* In this block, the space is visible.
1204 */
1205
1206 /* Rather than try to figure out what everything that we might
1207 * need to send is, then form the packet after that,
1208 * we presume that we will in fact form a packet, and update
1209 * the bits by what we do actually send. If we send nothing,
1210 * we just back out sl.length () to the old value, and no harm
1211 * is done.
1212 * I think this is simpler than doing a bunch of checks to see
1213 * what if anything we need to send, setting the bits, then
1214 * doing those checks again to add the real data.
1215 */
1216 oldlen = sl.length ();
1217 eoldlen = esl.length ();
1218
1219 sl << uint16 (mask);
1220
1221 unsigned char dummy;
1222 unsigned char *last_ext = &dummy;
1223
1224 /* Darkness changed */
1225 if (lastcell.count != d && socket.darkness)
1226 {
1227 mask |= 0x8;
1228
1229 if (socket.extmap)
1230 {
1231 *last_ext |= 0x80; 1110 *last_ext |= 0x80;
1232 last_ext = &sl[sl.length ()]; 1111 last_ext = &sl[sl.length ()];
1233 sl << uint8 (d); 1112
1234 } 1113 sl << uint8 (6) << uint8 (stat_width);
1235 else
1236 sl << uint8 (255 - 64 * d);
1237 } 1114 }
1115 }
1238 1116
1239 lastcell.count = d; 1117 if (expect_false (lastcell.player != player))
1240
1241 mapspace &ms = m->at (nx, ny);
1242 ms.update ();
1243
1244 if (socket.extmap)
1245 { 1118 {
1246 uint8 stat_hp = 0; 1119 lastcell.player = player;
1247 uint8 stat_width = 0;
1248 uint8 flags = 0;
1249 tag_t player = 0;
1250 1120
1251 // send hp information, if applicable
1252 if (object *op = ms.faces_obj [0])
1253 if (op->is_head () && !op->invisible)
1254 {
1255 if (op->stats.maxhp > op->stats.hp
1256 && op->stats.maxhp > 0
1257 && (op->type == PLAYER
1258 || op->type == DOOR // does not work, have maxhp 0
1259 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
1260 {
1261 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1262 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1263 }
1264
1265 if (op->msg && op->msg[0] == '@')
1266 flags |= 1;
1267
1268 if (op->type == PLAYER && op != ob)
1269 player = op->count;
1270 }
1271
1272 if (lastcell.stat_hp != stat_hp)
1273 {
1274 lastcell.stat_hp = stat_hp;
1275
1276 mask |= 0x8; 1121 mask |= 0x8;
1277 *last_ext |= 0x80; 1122 *last_ext |= 0x80;
1278 last_ext = &sl[sl.length ()]; 1123 last_ext = &sl[sl.length ()];
1279 1124
1280 sl << uint8 (5) << uint8 (stat_hp);
1281
1282 if (stat_width > 1)
1283 {
1284 *last_ext |= 0x80;
1285 last_ext = &sl[sl.length ()];
1286
1287 sl << uint8 (6) << uint8 (stat_width);
1288 }
1289 }
1290
1291 if (lastcell.player != player)
1292 {
1293 lastcell.player = player;
1294
1295 mask |= 0x8;
1296 *last_ext |= 0x80;
1297 last_ext = &sl[sl.length ()];
1298
1299 sl << uint8 (0x47) << uint8 (4) << (uint32)player; 1125 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1300 } 1126 }
1301 1127
1302 if (lastcell.flags != flags) 1128 if (expect_false (lastcell.flags != flags))
1303 { 1129 {
1304 lastcell.flags = flags; 1130 lastcell.flags = flags;
1305 1131
1306 mask |= 0x8; 1132 mask |= 0x8;
1307 *last_ext |= 0x80; 1133 *last_ext |= 0x80;
1308 last_ext = &sl[sl.length ()]; 1134 last_ext = &sl[sl.length ()];
1309 1135
1310 sl << uint8 (8) << uint8 (flags); 1136 sl << uint8 (8) << uint8 (flags);
1311 }
1312 } 1137 }
1313 1138
1139 // faces
1140
1314 /* Floor face */ 1141 /* Floor face */
1315 if (update_space (sl, socket, ms, lastcell, 2)) 1142 if (update_space (sl, socket, ms, lastcell, 2))
1316 mask |= 0x4; 1143 mask |= 0x4;
1317 1144
1318 /* Middle face */ 1145 /* Middle face */
1319 if (update_space (sl, socket, ms, lastcell, 1)) 1146 if (update_space (sl, socket, ms, lastcell, 1))
1320 mask |= 0x2; 1147 mask |= 0x2;
1321 1148
1149 if (expect_false (ob->invisible)
1150 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1322 if (ms.player () == ob 1151 && ms.player () == ob)
1323 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1324 { 1152 {
1325 // force player to be visible to himself if invisible 1153 // force player to be visible to himself if invisible
1326 if (lastcell.faces[0] != ob->face) 1154 if (lastcell.faces[0] != ob->face)
1327 { 1155 {
1328 lastcell.faces[0] = ob->face; 1156 lastcell.faces[0] = ob->face;
1329 1157
1330 mask |= 0x1;
1331 sl << uint16 (ob->face);
1332
1333 socket.send_faces (ob);
1334 }
1335 }
1336 /* Top face */
1337 else if (update_space (sl, socket, ms, lastcell, 0))
1338 mask |= 0x1; 1158 mask |= 0x1;
1159 sl << uint16 (ob->face);
1339 1160
1161 socket.send_faces (ob);
1162 }
1163 }
1164 /* Top face */
1165 else if (update_space (sl, socket, ms, lastcell, 0))
1166 mask |= 0x1;
1167
1340 /* Check to see if we are in fact sending anything for this 1168 /* Check to see if we are in fact sending anything for this
1341 * space by checking the mask. If so, update the mask. 1169 * space by checking the mask. If so, update the mask.
1342 * if not, reset the len to that from before adding the mask 1170 * if not, reset the len to that from before adding the mask
1343 * value, so we don't send those bits. 1171 * value, so we don't send those bits.
1344 */ 1172 */
1345 if (mask & 0xf) 1173 if (mask & 0xf)
1346 sl[oldlen + 1] = mask & 0xff; 1174 sl[oldlen + 1] = mask & 0xff;
1347 else 1175 else
1348 sl.reset (oldlen); 1176 sl.reset (oldlen);
1349
1350 if (socket.ext_mapinfos)
1351 esl << uint16 (emask);
1352
1353 if (socket.EMI_smooth)
1354 {
1355 for (int layer = 2+1; layer--; )
1356 {
1357 object *ob = ms.faces_obj [layer];
1358
1359 // If there is no object for this space, or if the face for the object
1360 // is the blank face, set the smoothlevel to zero.
1361 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1362
1363 // We've gotten what face we want to use for the object. Now see if
1364 // if it has changed since we last sent it to the client.
1365 if (lastcell.smooth[layer] != smoothlevel)
1366 {
1367 lastcell.smooth[layer] = smoothlevel;
1368 esl << uint8 (smoothlevel);
1369 emask |= 1 << layer;
1370 }
1371 }
1372
1373 if (emask & 0xf)
1374 esl[eoldlen + 1] = emask & 0xff;
1375 else
1376 esl.reset (eoldlen);
1377 }
1378 } /* else this is a viewable space */ 1177 } /* else this is a viewable space */
1379 } /* for x loop */ 1178 ordered_mapwalk_end
1380 } /* for y loop */
1381 1179
1382 socket.flush_fx (); 1180 socket.flush_fx ();
1383
1384 /* Verify that we in fact do need to send this */
1385 if (socket.ext_mapinfos)
1386 {
1387 if (!(sl.length () > startlen || socket.sent_scroll))
1388 {
1389 /* No map data will follow, so don't say the client
1390 * it doesn't need draw!
1391 */
1392 ewhatflag &= ~EMI_NOREDRAW;
1393 esl[ewhatstart + 1] = ewhatflag & 0xff;
1394 }
1395
1396 if (esl.length () > estartlen)
1397 socket.send_packet (esl);
1398 }
1399 1181
1400 if (sl.length () > startlen || socket.sent_scroll) 1182 if (sl.length () > startlen || socket.sent_scroll)
1401 { 1183 {
1402 socket.send_packet (sl); 1184 socket.send_packet (sl);
1403 socket.sent_scroll = 0; 1185 socket.sent_scroll = 0;
1404 } 1186 }
1405} 1187}
1406 1188
1407/*****************************************************************************/
1408/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1409/* a player. Of course, the client need to know the command to be able to */
1410/* manage it ! */
1411/*****************************************************************************/
1412void
1413send_plugin_custom_message (object *pl, char *buf)
1414{
1415 pl->contr->ns->send_packet (buf);
1416}
1417
1418/**
1419 * This sends the skill number to name mapping. We ignore
1420 * the params - we always send the same info no matter what.
1421 */
1422void
1423send_skill_info (client *ns, char *params)
1424{
1425 packet sl;
1426 sl << "replyinfo skill_info\n";
1427
1428 for (int i = 1; i < NUM_SKILLS; i++)
1429 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1430
1431 if (sl.length () > MAXSOCKBUF)
1432 {
1433 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1434 fatal (0);
1435 }
1436
1437 ns->send_packet (sl);
1438}
1439
1440/**
1441 * This sends the spell path to name mapping. We ignore
1442 * the params - we always send the same info no matter what.
1443 */
1444void
1445send_spell_paths (client * ns, char *params)
1446{
1447 packet sl;
1448
1449 sl << "replyinfo spell_paths\n";
1450
1451 for (int i = 0; i < NRSPELLPATHS; i++)
1452 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1453
1454 if (sl.length () > MAXSOCKBUF)
1455 {
1456 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1457 fatal (0);
1458 }
1459
1460 ns->send_packet (sl);
1461}
1462
1463/** 1189/**
1464 * This looks for any spells the player may have that have changed their stats. 1190 * This looks for any spells the player may have that have changed their stats.
1465 * it then sends an updspell packet for each spell that has changed in this way 1191 * it then sends an updspell packet for each spell that has changed in this way
1466 */ 1192 */
1467void 1193void
1468esrv_update_spells (player *pl) 1194esrv_update_spells (player *pl)
1469{ 1195{
1470 if (!pl->ns) 1196 if (!pl->ns)
1471 return; 1197 return;
1472 1198
1199 pl->ns->update_spells = false;
1200
1473 if (!pl->ns->monitor_spells) 1201 if (!pl->ns->monitor_spells)
1474 return; 1202 return;
1475 1203
1476 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1204 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1477 {
1478 if (spell->type == SPELL) 1205 if (spell->type == SPELL)
1479 { 1206 {
1480 int flags = 0; 1207 int flags = 0;
1208 int val;
1481 1209
1482 /* check if we need to update it */ 1210 /* check if we need to update it */
1483 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1211 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1212 if (spell->cached_sp != val)
1484 { 1213 {
1485 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1214 spell->cached_sp = val;
1486 flags |= UPD_SP_MANA; 1215 flags |= UPD_SP_MANA;
1487 } 1216 }
1488 1217
1489 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1218 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1219 if (spell->cached_grace != val)
1490 { 1220 {
1491 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1221 spell->cached_grace = val;
1492 flags |= UPD_SP_GRACE; 1222 flags |= UPD_SP_GRACE;
1493 } 1223 }
1494 1224
1495 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1225 val = casting_level (pl->ob, spell);
1226 if (spell->cached_eat != val)
1496 { 1227 {
1497 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1228 spell->cached_eat = val;
1498 flags |= UPD_SP_DAMAGE; 1229 flags |= UPD_SP_LEVEL;
1499 } 1230 }
1500 1231
1501 if (flags) 1232 if (flags)
1502 { 1233 {
1503 packet sl; 1234 packet sl;
1504 1235
1505 sl << "updspell " 1236 sl << "updspell "
1506 << uint8 (flags) 1237 << uint8 (flags)
1507 << uint32 (spell->count); 1238 << uint32 (spell->count);
1508 1239
1509 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1240 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1510 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1241 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1511 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1242 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1512 1243
1513 pl->ns->send_packet (sl); 1244 pl->ns->send_packet (sl);
1514 } 1245 }
1515 } 1246 }
1516 }
1517} 1247}
1518 1248
1519void 1249void
1520esrv_remove_spell (player *pl, object *spell) 1250esrv_remove_spell (player *pl, object *spell)
1521{ 1251{
… …
1546 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1276 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1547 return; 1277 return;
1548 } 1278 }
1549 1279
1550 /* store costs and damage in the object struct, to compare to later */ 1280 /* store costs and damage in the object struct, to compare to later */
1551 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1281 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1552 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1282 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1553 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1283 spell->cached_eat = casting_level (pl->ob, spell);
1554 1284
1555 /* figure out which skill it uses, if it uses one */ 1285 /* figure out which skill it uses, if it uses one */
1556 if (spell->skill) 1286 if (spell->skill)
1557 { 1287 if (object *tmp = pl->find_skill (spell->skill))
1558 for (i = 1; i < NUM_SKILLS; i++) 1288 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1559 if (!strcmp (spell->skill, skill_names[i]))
1560 {
1561 skill = i + CS_STAT_SKILLINFO;
1562 break;
1563 }
1564 }
1565 1289
1566 // spells better have a face 1290 // spells better have a face
1567 if (!spell->face) 1291 if (!spell->face)
1568 { 1292 {
1569 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1293 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
… …
1574 1298
1575 /* send the current values */ 1299 /* send the current values */
1576 sl << uint32 (spell->count) 1300 sl << uint32 (spell->count)
1577 << uint16 (spell->level) 1301 << uint16 (spell->level)
1578 << uint16 (spell->casting_time) 1302 << uint16 (spell->casting_time)
1579 << uint16 (spell->last_sp) 1303 << uint16 (spell->cached_sp)
1580 << uint16 (spell->last_grace) 1304 << uint16 (spell->cached_grace)
1581 << uint16 (spell->last_eat) 1305 << uint16 (spell->cached_eat)
1582 << uint8 (skill) 1306 << uint8 (skill)
1583 << uint32 (spell->path_attuned) 1307 << uint32 (spell->path_attuned)
1584 << uint32 (spell->face) 1308 << uint32 (spell->face)
1585 << data8 (spell->name) 1309 << data8 (spell->name)
1586 << data16 (spell->msg); 1310 << data16 (spell->msg);
… …
1643 } 1367 }
1644 else 1368 else
1645 append_spell (pl, sl, spell); 1369 append_spell (pl, sl, spell);
1646 1370
1647 if (sl.length () > MAXSOCKBUF) 1371 if (sl.length () > MAXSOCKBUF)
1648 {
1649 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1372 cleanup ("buffer overflow in esrv_add_spells!");
1650 fatal (0);
1651 }
1652 1373
1653 /* finally, we can send the packet */ 1374 /* finally, we can send the packet */
1654 pl->ns->flush_fx (); 1375 pl->ns->flush_fx ();
1655 pl->ns->send_packet (sl); 1376 pl->ns->send_packet (sl);
1656} 1377}
1657 1378
1379//-GPL
1380

Diff Legend

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