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.144 by root, Fri Dec 26 10:36:42 2008 UTC vs.
Revision 1.167 by root, Sat Apr 3 22:30:21 2010 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 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 *
… …
63 * This table translates the attack numbers as used within the 66 * This table translates the attack numbers as used within the
64 * 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
65 * 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
66 * client. 69 * client.
67 */ 70 */
68short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS, 71static short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,
69 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC, 72 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,
70 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID, 73 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,
71 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ , 74 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,
72 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 75 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,
73 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD, 76 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD,
… …
141 144
142static void 145static void
143send_map_info (player *pl) 146send_map_info (player *pl)
144{ 147{
145 client &socket = *pl->ns; 148 client &socket = *pl->ns;
146 object *ob = pl->observe; 149 object *ob = pl->viewpoint;
147 150
148 if (socket.mapinfocmd) 151 if (socket.mapinfocmd)
149 { 152 {
150 if (ob->map && ob->map->path[0]) 153 if (ob->map && ob->map->path[0])
151 { 154 {
… …
168/** check for map/region change and send new map data */ 171/** check for map/region change and send new map data */
169static void 172static void
170check_map_change (player *pl) 173check_map_change (player *pl)
171{ 174{
172 client &socket = *pl->ns; 175 client &socket = *pl->ns;
173 object *ob = pl->observe; 176 object *ob = pl->viewpoint;
174 177
175 region *reg = ob->region (); 178 region *reg = ob->region ();
176 if (socket.current_region != reg) 179 if (socket.current_region != reg)
177 { 180 {
178 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region)); 181 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
… …
208 else if (socket.current_x != ob->x || socket.current_y != ob->y) 211 else if (socket.current_x != ob->x || socket.current_y != ob->y)
209 { 212 {
210 int dx = ob->x - socket.current_x; 213 int dx = ob->x - socket.current_x;
211 int dy = ob->y - socket.current_y; 214 int dy = ob->y - socket.current_y;
212 215
213 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
214 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
215 else
216 {
217 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 216 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
218 socket.floorbox_reset (); 217 socket.floorbox_reset ();
219 }
220 } 218 }
221 219
222 socket.current_x = ob->x; 220 socket.current_x = ob->x;
223 socket.current_y = ob->y; 221 socket.current_y = ob->y;
222}
223
224/**
225 * This sends the skill number to name mapping. We ignore
226 * the params - we always send the same info no matter what.
227 */
228static void
229send_skill_info (client *ns, char *params)
230{
231 packet sl;
232 sl << "replyinfo skill_info\n";
233
234 for (int i = 1; i < NUM_SKILLS; i++)
235 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
236
237 if (sl.length () > MAXSOCKBUF)
238 {
239 LOG (llevError, "Buffer overflow in send_skill_info!\n");
240 fatal (0);
241 }
242
243 ns->send_packet (sl);
244}
245
246/**
247 * This sends the spell path to name mapping. We ignore
248 * the params - we always send the same info no matter what.
249 */
250static void
251send_spell_paths (client * ns, char *params)
252{
253 packet sl;
254
255 sl << "replyinfo spell_paths\n";
256
257 for (int i = 0; i < NRSPELLPATHS; i++)
258 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
259
260 if (sl.length () > MAXSOCKBUF)
261 {
262 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
263 fatal (0);
264 }
265
266 ns->send_packet (sl);
224} 267}
225 268
226/** 269/**
227 * RequestInfo is sort of a meta command. There is some specific 270 * RequestInfo is sort of a meta command. There is some specific
228 * request of information, but we call other functions to provide 271 * request of information, but we call other functions to provide
… …
241 { 284 {
242 *params++ = 0; 285 *params++ = 0;
243 break; 286 break;
244 } 287 }
245 288
246 if (!strcmp (buf, "image_info"))
247 send_image_info (ns, params);
248 else if (!strcmp (buf, "image_sums"))
249 send_image_sums (ns, params);
250 else if (!strcmp (buf, "skill_info")) 289 if (!strcmp (buf, "skill_info"))
251 send_skill_info (ns, params); 290 send_skill_info (ns, params);
252 else if (!strcmp (buf, "spell_paths")) 291 else if (!strcmp (buf, "spell_paths"))
253 send_spell_paths (ns, params); 292 send_spell_paths (ns, params);
254 else 293 else
255 { 294 {
… …
271ExtiCmd (char *buf, int len, client *ns) 310ExtiCmd (char *buf, int len, client *ns)
272{ 311{
273 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 312 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
274} 313}
275 314
315//-GPL
316
276void 317void
277client::mapinfo_queue_clear () 318client::mapinfo_queue_clear ()
278{ 319{
279 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) 320 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
280 free (*i); 321 free (*i);
… …
287{ 328{
288 char *token = buf; 329 char *token = buf;
289 buf += strlen (buf) + 9; 330 buf += strlen (buf) + 9;
290 331
291 // initial map and its origin 332 // initial map and its origin
292 maptile *map = pl->observe->map; 333 maptile *map = pl->viewpoint->map;
293 int mapx = pl->ns->mapx / 2 - pl->observe->x; 334 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
294 int mapy = pl->ns->mapy / 2 - pl->observe->y; 335 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
295 int max_distance = 8; // limit maximum path length to something generous 336 int max_distance = 8; // limit maximum path length to something generous
296 337
297 while (*buf && map && max_distance) 338 while (*buf && map && max_distance)
298 { 339 {
299 int dir = *buf++ - '1'; 340 int dir = *buf++ - '1';
… …
404AddMeCmd (char *buf, int len, client *ns) 445AddMeCmd (char *buf, int len, client *ns)
405{ 446{
406 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 447 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
407} 448}
408 449
409/** Reply to ExtendedInfos command */ 450//+GPL
410void
411ToggleExtendedInfos (char *buf, int len, client * ns)
412{
413 char cmdback[MAX_BUF];
414 char command[50];
415 int info, nextinfo;
416
417 cmdback[0] = '\0';
418 nextinfo = 0;
419
420 while (1)
421 {
422 /* 1. Extract an info */
423 info = nextinfo;
424
425 while ((info < len) && (buf[info] == ' '))
426 info++;
427
428 if (info >= len)
429 break;
430
431 nextinfo = info + 1;
432
433 while ((nextinfo < len) && (buf[nextinfo] != ' '))
434 nextinfo++;
435
436 if (nextinfo - info >= 49) /*Erroneous info asked */
437 continue;
438
439 strncpy (command, &(buf[info]), nextinfo - info);
440
441 /* 2. Interpret info */
442 if (!strcmp ("smooth", command))
443 /* Toggle smoothing */
444 ns->EMI_smooth = !ns->EMI_smooth;
445 else
446 /*bad value */;
447
448 /*3. Next info */
449 }
450
451 strcpy (cmdback, "ExtendedInfoSet");
452
453 if (ns->EMI_smooth)
454 {
455 strcat (cmdback, " ");
456 strcat (cmdback, "smoothing");
457 }
458
459 ns->send_packet (cmdback);
460}
461 451
462/* 452/*
463#define MSG_TYPE_BOOK 1 453#define MSG_TYPE_BOOK 1
464#define MSG_TYPE_CARD 2 454#define MSG_TYPE_CARD 2
465#define MSG_TYPE_PAPER 3 455#define MSG_TYPE_PAPER 3
… …
482 while (1) 472 while (1)
483 { 473 {
484 /* 1. Extract an info */ 474 /* 1. Extract an info */
485 info = nextinfo; 475 info = nextinfo;
486 476
487 while ((info < len) && (buf[info] == ' ')) 477 while ((info < len) && (buf [info] == ' '))
488 info++; 478 info++;
489 479
490 if (info >= len) 480 if (info >= len)
491 break; 481 break;
492 482
493 nextinfo = info + 1; 483 nextinfo = info + 1;
494 484
495 while ((nextinfo < len) && (buf[nextinfo] != ' ')) 485 while ((nextinfo < len) && (buf [nextinfo] != ' '))
496 nextinfo++; 486 nextinfo++;
497 487
498 if (nextinfo - info >= 49) /*Erroneous info asked */ 488 if (nextinfo - info >= 49) /*Erroneous info asked */
499 continue; 489 continue;
500 490
501 strncpy (command, &(buf[info]), nextinfo - info); 491 memcpy (command, buf + info, nextinfo - info);
502 command[nextinfo - info] = '\0'; 492 command [nextinfo - info] = 0;
493
503 /* 2. Interpret info */ 494 /* 2. Interpret info */
504 i = sscanf (command, "%d", &flag); 495 i = sscanf (command, "%d", &flag);
505 496
506 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST)) 497 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
507 ns->supported_readables |= (1 << flag); 498 ns->supported_readables |= (1 << flag);
… …
541 return; 532 return;
542 533
543 buf++; 534 buf++;
544 } 535 }
545 536
546 execute_newserver_command (pl->ob, (char *) buf); 537 execute_newserver_command (pl->ob, (char *)buf);
547 538
548 /* Perhaps something better should be done with a left over count. 539 /* Perhaps something better should be done with a left over count.
549 * Cleaning up the input should probably be done first - all actions 540 * Cleaning up the input should probably be done first - all actions
550 * for the command that issued the count should be done before any other 541 * for the command that issued the count should be done before any other
551 * commands. 542 * commands.
… …
585 * commands. 576 * commands.
586 */ 577 */
587 pl->count = 0; 578 pl->count = 0;
588 579
589 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 580 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
590 int time = fabs (pl->ob->speed) < 0.001 581 int time = pl->ob->has_active_speed ()
591 ? time = MAX_TIME * 100
592 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 582 ? (int) (MAX_TIME / pl->ob->speed)
583 : MAX_TIME * 100;
593 584
594 /* Send confirmation of command execution now */ 585 /* Send confirmation of command execution now */
595 packet sl ("comc"); 586 packet sl ("comc");
596 sl << uint16 (cmdid) << uint32 (time); 587 sl << uint16 (cmdid) << uint32 (time);
597 pl->ns->send_packet (sl); 588 pl->ns->send_packet (sl);
… …
743 * Get player's current range attack in obuf. 734 * Get player's current range attack in obuf.
744 */ 735 */
745static void 736static void
746rangetostring (player *pl, char *obuf) 737rangetostring (player *pl, char *obuf)
747{ 738{
748 dynbuf_text buf; 739 dynbuf_text &buf = msg_dynbuf; buf.clear ();
740
741#if 0
742 // print ranged/chosen_skill etc. objects every call
743 printf ("%s %s => %s (%s)\n",
744 pl->ranged_ob ? &pl->ranged_ob->name : "-",
745 pl->combat_ob ? &pl->combat_ob->name : "-",
746 pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
747 pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
748 );
749#endif
749 750
750 if (pl->ranged_ob) 751 if (pl->ranged_ob)
751 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 752 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
752 753
753 if (pl->combat_ob) 754 if (pl->combat_ob)
… …
847 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 848 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
848 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 849 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
849 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 850 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
850 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 851 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
851 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 852 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
852 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK); 853 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
853 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 854 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
854 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); 855 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
855 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 856 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
856 857
857 flags = 0; 858 flags = 0;
858 859
859 if (opl->fire_on) 860 if (opl->fire_on)
… …
862 if (opl->run_on) 863 if (opl->run_on)
863 flags |= SF_RUNON; 864 flags |= SF_RUNON;
864 865
865 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 866 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
866 867
867 if (ns->sc_version < 1025)
868 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
869 else
870 for (int i = 0; i < NROFATTACKS; i++) 868 for (int i = 0; i < NROFATTACKS; i++)
871 { 869 {
872 /* Skip ones we won't send */ 870 /* Skip ones we won't send */
873 if (atnr_cs_stat[i] == -1) 871 if (atnr_cs_stat[i] == -1)
874 continue; 872 continue;
875 873
876 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 874 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
877 } 875 }
878 876
879 if (pl->ns->monitor_spells) 877 if (pl->ns->monitor_spells)
880 { 878 {
881 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 879 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
882 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 880 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
… …
984 982
985 /* Nothing changed */ 983 /* Nothing changed */
986 return 0; 984 return 0;
987} 985}
988 986
989/** 987//-GPL
990 * Returns the size of a data for a map square as returned by
991 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
992 * available.
993 */
994int
995getExtendedMapInfoSize (client * ns)
996{
997 int result = 0;
998
999 if (ns->ext_mapinfos)
1000 {
1001 if (ns->EMI_smooth)
1002 result += 1; /*One byte for smoothlevel */
1003 }
1004
1005 return result;
1006}
1007 988
1008// prefetch (and touch) all maps within a specific distancd 989// prefetch (and touch) all maps within a specific distancd
1009static void 990static void
1010prefetch_surrounding_maps (maptile *map, int distance) 991prefetch_surrounding_maps (maptile *map, int distance)
1011{ 992{
1012 map->last_access = runtime; 993 map->touch ();
1013 994
1014 if (--distance) 995 if (--distance)
1015 for (int dir = 4; --dir; ) 996 for (int dir = 4; dir--; )
1016 if (const shstr &path = map->tile_path [dir]) 997 if (const shstr &path = map->tile_path [dir])
1017 if (maptile *&neigh = map->tile_map [dir]) 998 if (maptile *&neigh = map->tile_map [dir])
1018 prefetch_surrounding_maps (neigh, distance); 999 prefetch_surrounding_maps (neigh, distance);
1019 else 1000 else
1020 neigh = maptile::find_async (path, map); 1001 neigh = maptile::find_async (path, map);
… …
1025prefetch_surrounding_maps (object *op) 1006prefetch_surrounding_maps (object *op)
1026{ 1007{
1027 prefetch_surrounding_maps (op->map, 3); 1008 prefetch_surrounding_maps (op->map, 3);
1028} 1009}
1029 1010
1011//+GPL
1012
1030/** 1013/**
1031 * Draws client map. 1014 * Draws client map.
1032 */ 1015 */
1033void 1016void
1034draw_client_map (player *pl) 1017draw_client_map (player *pl)
1035{ 1018{
1036 object *ob = pl->observe; 1019 object *ob = pl->viewpoint;
1037 if (!ob->active) 1020 if (!pl->observe->active)
1038 return; 1021 return;
1039 1022
1040 /* If player is just joining the game, he isn't here yet, so the map 1023 /* If player is just joining the game, he isn't here yet, so the map
1041 * can get swapped out. If so, don't try to send them a map. All will 1024 * can get swapped out. If so, don't try to send them a map. All will
1042 * be OK once they really log in. 1025 * be OK once they really log in.
1043 */ 1026 */
1044 if (!ob->map || ob->map->in_memory != MAP_ACTIVE) 1027 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1045 return; 1028 return;
1046 1029
1047 int startlen, oldlen; 1030 int startlen, oldlen;
1048 int estartlen, eoldlen;
1049 uint8 eentrysize;
1050 uint16 ewhatstart, ewhatflag;
1051 uint8 extendedinfos;
1052 1031
1053 check_map_change (pl); 1032 check_map_change (pl);
1054 prefetch_surrounding_maps (pl->ob); 1033 prefetch_surrounding_maps (pl->ob);
1055 1034
1056 /* do LOS after calls to update_position */ 1035 /* do LOS after calls to update_position */
1057 /* unfortunately, we need to udpate los when observing, currently */ 1036 /* unfortunately, we need to udpate los when observing, currently */
1058 if (pl->do_los || pl->observe != pl->ob) 1037 if (pl->do_los || pl->viewpoint != pl->ob)
1059 { 1038 {
1060 pl->do_los = 0; 1039 pl->do_los = 0;
1061 pl->update_los (); 1040 pl->update_los ();
1062 } 1041 }
1063 1042
… …
1085 */ 1064 */
1086 1065
1087 client &socket = *pl->ns; 1066 client &socket = *pl->ns;
1088 1067
1089 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1068 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1090 packet esl;
1091 1069
1092 startlen = sl.length (); 1070 startlen = sl.length ();
1093
1094 /*Extendedmapinfo structure initialisation */
1095 if (socket.ext_mapinfos)
1096 {
1097 extendedinfos = EMI_NOREDRAW;
1098
1099 if (socket.EMI_smooth)
1100 extendedinfos |= EMI_SMOOTH;
1101
1102 ewhatstart = esl.length ();
1103 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1104 could need to be taken away */
1105 eentrysize = getExtendedMapInfoSize (&socket);
1106 esl << "mapextended "
1107 << uint8 (extendedinfos)
1108 << uint8 (eentrysize);
1109
1110 estartlen = esl.length ();
1111 }
1112 1071
1113 int hx = socket.mapx / 2; 1072 int hx = socket.mapx / 2;
1114 int hy = socket.mapy / 2; 1073 int hy = socket.mapy / 2;
1115 1074
1116 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy) 1075 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1117 int ax = dx + hx; 1076 int ax = dx + hx;
1118 int ay = dy + hy; 1077 int ay = dy + hy;
1119 1078
1120 int emask, mask;
1121 emask = mask = (ax << 10) | (ay << 4); 1079 int mask = (ax << 10) | (ay << 4);
1122
1123 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1080 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1124 1081
1125 /* If the coordinates are not valid, or it is too dark to see, 1082 /* If the coordinates are not valid, or it is too dark to see,
1126 * we tell the client as such 1083 * we tell the client as such
1127 */ 1084 */
… …
1137 map_clearcell (&lastcell, -1); 1094 map_clearcell (&lastcell, -1);
1138 } 1095 }
1139 1096
1140 continue; 1097 continue;
1141 } 1098 }
1142 1099
1143 int d = pl->blocked_los_uc (dx, dy); 1100 int d = pl->blocked_los_uc (dx, dy);
1144 1101
1145 if (d > 3) 1102 if (d > 3)
1146 { 1103 {
1147 /* This block deals with spaces that are not visible for whatever 1104 /* This block deals with spaces that are not visible for whatever
… …
1173 * I think this is simpler than doing a bunch of checks to see 1130 * I think this is simpler than doing a bunch of checks to see
1174 * what if anything we need to send, setting the bits, then 1131 * what if anything we need to send, setting the bits, then
1175 * doing those checks again to add the real data. 1132 * doing those checks again to add the real data.
1176 */ 1133 */
1177 oldlen = sl.length (); 1134 oldlen = sl.length ();
1178 eoldlen = esl.length ();
1179 1135
1180 sl << uint16 (mask); 1136 sl << uint16 (mask);
1181 1137
1182 unsigned char dummy; 1138 unsigned char dummy;
1183 unsigned char *last_ext = &dummy; 1139 unsigned char *last_ext = &dummy;
1184 1140
1185 /* Darkness changed */ 1141 /* Darkness changed */
1186 if (lastcell.count != d && socket.darkness) 1142 if (lastcell.count != d)
1187 { 1143 {
1188 mask |= 0x8; 1144 mask |= 0x8;
1189 1145
1190 if (socket.extmap) 1146 *last_ext |= 0x80;
1147 last_ext = &sl[sl.length ()];
1148 sl << uint8 (d);
1149 }
1150
1151 lastcell.count = d;
1152
1153 mapspace &ms = m->at (nx, ny);
1154 ms.update ();
1155
1156 // extmap handling
1157 uint8 stat_hp = 0;
1158 uint8 stat_width = 0;
1159 uint8 flags = 0;
1160 tag_t player = 0;
1161
1162 // send hp information, if applicable
1163 if (object *op = ms.faces_obj [0])
1164 if (op->is_head () && !op->invisible)
1165 {
1166 if (op->stats.maxhp > op->stats.hp
1167 && op->stats.maxhp > 0
1168 && (op->type == PLAYER
1169 || op->type == DOOR // does not work, have maxhp 0
1170 || QUERY_FLAG (op, FLAG_MONSTER)
1171 || QUERY_FLAG (op, FLAG_ALIVE)
1172 || QUERY_FLAG (op, FLAG_GENERATOR)))
1173 {
1174 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1175 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1176 }
1177
1178 if (expect_false (op->has_dialogue ()))
1179 flags |= 1;
1180
1181 if (expect_false (op->type == PLAYER))
1182 player = op == ob ? pl->ob->count
1183 : op == pl->ob ? ob->count
1184 : op->count;
1185 }
1186
1187 if (expect_false (lastcell.stat_hp != stat_hp))
1188 {
1189 lastcell.stat_hp = stat_hp;
1190
1191 mask |= 0x8;
1192 *last_ext |= 0x80;
1193 last_ext = &sl[sl.length ()];
1194
1195 sl << uint8 (5) << uint8 (stat_hp);
1196
1197 if (stat_width > 1)
1191 { 1198 {
1192 *last_ext |= 0x80; 1199 *last_ext |= 0x80;
1193 last_ext = &sl[sl.length ()]; 1200 last_ext = &sl[sl.length ()];
1194 sl << uint8 (d);
1195 }
1196 else
1197 sl << uint8 (255 - 64 * d);
1198 }
1199 1201
1200 lastcell.count = d;
1201
1202 mapspace &ms = m->at (nx, ny);
1203 ms.update ();
1204
1205 if (expect_true (socket.extmap))
1206 {
1207 uint8 stat_hp = 0;
1208 uint8 stat_width = 0;
1209 uint8 flags = 0;
1210 tag_t player = 0;
1211
1212 // send hp information, if applicable
1213 if (object *op = ms.faces_obj [0])
1214 if (op->is_head () && !op->invisible)
1215 {
1216 if (op->stats.maxhp > op->stats.hp
1217 && op->stats.maxhp > 0
1218 && (op->type == PLAYER
1219 || op->type == DOOR // does not work, have maxhp 0
1220 || QUERY_FLAG (op, FLAG_MONSTER)
1221 || QUERY_FLAG (op, FLAG_ALIVE)
1222 || QUERY_FLAG (op, FLAG_GENERATOR)))
1223 {
1224 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1225 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1226 }
1227
1228 if (expect_false (op->has_dialogue ()))
1229 flags |= 1;
1230
1231 if (expect_false (op->type == PLAYER))
1232 player = op == ob ? pl->ob->count
1233 : op == pl->ob ? ob->count
1234 : op->count;
1235 }
1236
1237 if (expect_false (lastcell.stat_hp != stat_hp))
1238 {
1239 lastcell.stat_hp = stat_hp;
1240
1241 mask |= 0x8;
1242 *last_ext |= 0x80;
1243 last_ext = &sl[sl.length ()];
1244
1245 sl << uint8 (5) << uint8 (stat_hp);
1246
1247 if (stat_width > 1)
1248 {
1249 *last_ext |= 0x80;
1250 last_ext = &sl[sl.length ()];
1251
1252 sl << uint8 (6) << uint8 (stat_width); 1202 sl << uint8 (6) << uint8 (stat_width);
1253 }
1254 }
1255
1256 if (expect_false (lastcell.player != player))
1257 {
1258 lastcell.player = player;
1259
1260 mask |= 0x8;
1261 *last_ext |= 0x80;
1262 last_ext = &sl[sl.length ()];
1263
1264 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1265 }
1266
1267 if (expect_false (lastcell.flags != flags))
1268 {
1269 lastcell.flags = flags;
1270
1271 mask |= 0x8;
1272 *last_ext |= 0x80;
1273 last_ext = &sl[sl.length ()];
1274
1275 sl << uint8 (8) << uint8 (flags);
1276 } 1203 }
1277 } 1204 }
1205
1206 if (expect_false (lastcell.player != player))
1207 {
1208 lastcell.player = player;
1209
1210 mask |= 0x8;
1211 *last_ext |= 0x80;
1212 last_ext = &sl[sl.length ()];
1213
1214 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1215 }
1216
1217 if (expect_false (lastcell.flags != flags))
1218 {
1219 lastcell.flags = flags;
1220
1221 mask |= 0x8;
1222 *last_ext |= 0x80;
1223 last_ext = &sl[sl.length ()];
1224
1225 sl << uint8 (8) << uint8 (flags);
1226 }
1227
1228 // faces
1278 1229
1279 /* Floor face */ 1230 /* Floor face */
1280 if (update_space (sl, socket, ms, lastcell, 2)) 1231 if (update_space (sl, socket, ms, lastcell, 2))
1281 mask |= 0x4; 1232 mask |= 0x4;
1282 1233
… …
1310 */ 1261 */
1311 if (mask & 0xf) 1262 if (mask & 0xf)
1312 sl[oldlen + 1] = mask & 0xff; 1263 sl[oldlen + 1] = mask & 0xff;
1313 else 1264 else
1314 sl.reset (oldlen); 1265 sl.reset (oldlen);
1315
1316 if (socket.ext_mapinfos)
1317 esl << uint16 (emask);
1318
1319 if (socket.EMI_smooth)
1320 {
1321 for (int layer = 2+1; layer--; )
1322 {
1323 object *ob = ms.faces_obj [layer];
1324
1325 // If there is no object for this space, or if the face for the object
1326 // is the blank face, set the smoothlevel to zero.
1327 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1328
1329 // We've gotten what face we want to use for the object. Now see if
1330 // if it has changed since we last sent it to the client.
1331 if (lastcell.smooth[layer] != smoothlevel)
1332 {
1333 lastcell.smooth[layer] = smoothlevel;
1334 esl << uint8 (smoothlevel);
1335 emask |= 1 << layer;
1336 }
1337 }
1338
1339 if (emask & 0xf)
1340 esl[eoldlen + 1] = emask & 0xff;
1341 else
1342 esl.reset (eoldlen);
1343 }
1344 } /* else this is a viewable space */ 1266 } /* else this is a viewable space */
1345 ordered_mapwalk_end 1267 ordered_mapwalk_end
1346 1268
1347 socket.flush_fx (); 1269 socket.flush_fx ();
1348 1270
1349 /* Verify that we in fact do need to send this */
1350 if (socket.ext_mapinfos)
1351 {
1352 if (!(sl.length () > startlen || socket.sent_scroll))
1353 {
1354 /* No map data will follow, so don't say the client
1355 * it doesn't need draw!
1356 */
1357 ewhatflag &= ~EMI_NOREDRAW;
1358 esl[ewhatstart + 1] = ewhatflag & 0xff;
1359 }
1360
1361 if (esl.length () > estartlen)
1362 socket.send_packet (esl);
1363 }
1364
1365 if (sl.length () > startlen || socket.sent_scroll) 1271 if (sl.length () > startlen || socket.sent_scroll)
1366 { 1272 {
1367 socket.send_packet (sl); 1273 socket.send_packet (sl);
1368 socket.sent_scroll = 0; 1274 socket.sent_scroll = 0;
1369 } 1275 }
1370} 1276}
1371 1277
1372/*****************************************************************************/
1373/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1374/* a player. Of course, the client need to know the command to be able to */
1375/* manage it ! */
1376/*****************************************************************************/
1377void
1378send_plugin_custom_message (object *pl, char *buf)
1379{
1380 pl->contr->ns->send_packet (buf);
1381}
1382
1383/**
1384 * This sends the skill number to name mapping. We ignore
1385 * the params - we always send the same info no matter what.
1386 */
1387void
1388send_skill_info (client *ns, char *params)
1389{
1390 packet sl;
1391 sl << "replyinfo skill_info\n";
1392
1393 for (int i = 1; i < NUM_SKILLS; i++)
1394 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1395
1396 if (sl.length () > MAXSOCKBUF)
1397 {
1398 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1399 fatal (0);
1400 }
1401
1402 ns->send_packet (sl);
1403}
1404
1405/**
1406 * This sends the spell path to name mapping. We ignore
1407 * the params - we always send the same info no matter what.
1408 */
1409void
1410send_spell_paths (client * ns, char *params)
1411{
1412 packet sl;
1413
1414 sl << "replyinfo spell_paths\n";
1415
1416 for (int i = 0; i < NRSPELLPATHS; i++)
1417 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1418
1419 if (sl.length () > MAXSOCKBUF)
1420 {
1421 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1422 fatal (0);
1423 }
1424
1425 ns->send_packet (sl);
1426}
1427
1428/** 1278/**
1429 * This looks for any spells the player may have that have changed their stats. 1279 * This looks for any spells the player may have that have changed their stats.
1430 * it then sends an updspell packet for each spell that has changed in this way 1280 * it then sends an updspell packet for each spell that has changed in this way
1431 */ 1281 */
1432void 1282void
1433esrv_update_spells (player *pl) 1283esrv_update_spells (player *pl)
1434{ 1284{
1435 if (!pl->ns) 1285 if (!pl->ns)
1436 return; 1286 return;
1437 1287
1288 pl->ns->update_spells = false;
1289
1438 if (!pl->ns->monitor_spells) 1290 if (!pl->ns->monitor_spells)
1439 return; 1291 return;
1440 1292
1441 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1293 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1442 {
1443 if (spell->type == SPELL) 1294 if (spell->type == SPELL)
1444 { 1295 {
1445 int flags = 0; 1296 int flags = 0;
1297 int val;
1446 1298
1447 /* check if we need to update it */ 1299 /* check if we need to update it */
1448 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1300 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1301 if (spell->cached_sp != val)
1449 { 1302 {
1450 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1303 spell->cached_sp = val;
1451 flags |= UPD_SP_MANA; 1304 flags |= UPD_SP_MANA;
1452 } 1305 }
1453 1306
1454 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1307 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1308 if (spell->cached_grace != val)
1455 { 1309 {
1456 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1310 spell->cached_grace = val;
1457 flags |= UPD_SP_GRACE; 1311 flags |= UPD_SP_GRACE;
1458 } 1312 }
1459 1313
1460 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1314 val = casting_level (pl->ob, spell);
1315 if (spell->cached_eat != val)
1461 { 1316 {
1462 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1317 spell->cached_eat = val;
1463 flags |= UPD_SP_DAMAGE; 1318 flags |= UPD_SP_LEVEL;
1464 } 1319 }
1465 1320
1466 if (flags) 1321 if (flags)
1467 { 1322 {
1468 packet sl; 1323 packet sl;
1469 1324
1470 sl << "updspell " 1325 sl << "updspell "
1471 << uint8 (flags) 1326 << uint8 (flags)
1472 << uint32 (spell->count); 1327 << uint32 (spell->count);
1473 1328
1474 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); 1329 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1475 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); 1330 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1476 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); 1331 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1477 1332
1478 pl->ns->send_packet (sl); 1333 pl->ns->send_packet (sl);
1479 } 1334 }
1480 } 1335 }
1481 }
1482} 1336}
1483 1337
1484void 1338void
1485esrv_remove_spell (player *pl, object *spell) 1339esrv_remove_spell (player *pl, object *spell)
1486{ 1340{
… …
1513 } 1367 }
1514 1368
1515 /* store costs and damage in the object struct, to compare to later */ 1369 /* store costs and damage in the object struct, to compare to later */
1516 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1370 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1517 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1371 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1518 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1372 spell->cached_eat = casting_level (pl->ob, spell);
1519 1373
1520 /* figure out which skill it uses, if it uses one */ 1374 /* figure out which skill it uses, if it uses one */
1521 if (spell->skill) 1375 if (spell->skill)
1522 if (object *tmp = pl->find_skill (spell->skill)) 1376 if (object *tmp = pl->find_skill (spell->skill))
1523 skill = tmp->subtype + CS_STAT_SKILLINFO; 1377 skill = tmp->subtype + CS_STAT_SKILLINFO;
… …
1612 /* finally, we can send the packet */ 1466 /* finally, we can send the packet */
1613 pl->ns->flush_fx (); 1467 pl->ns->flush_fx ();
1614 pl->ns->send_packet (sl); 1468 pl->ns->send_packet (sl);
1615} 1469}
1616 1470
1471//-GPL
1472

Diff Legend

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