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.145 by root, Fri Dec 26 10:44:17 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
450//+GPL
451
409/* 452/*
410#define MSG_TYPE_BOOK 1 453#define MSG_TYPE_BOOK 1
411#define MSG_TYPE_CARD 2 454#define MSG_TYPE_CARD 2
412#define MSG_TYPE_PAPER 3 455#define MSG_TYPE_PAPER 3
413#define MSG_TYPE_SIGN 4 456#define MSG_TYPE_SIGN 4
… …
429 while (1) 472 while (1)
430 { 473 {
431 /* 1. Extract an info */ 474 /* 1. Extract an info */
432 info = nextinfo; 475 info = nextinfo;
433 476
434 while ((info < len) && (buf[info] == ' ')) 477 while ((info < len) && (buf [info] == ' '))
435 info++; 478 info++;
436 479
437 if (info >= len) 480 if (info >= len)
438 break; 481 break;
439 482
440 nextinfo = info + 1; 483 nextinfo = info + 1;
441 484
442 while ((nextinfo < len) && (buf[nextinfo] != ' ')) 485 while ((nextinfo < len) && (buf [nextinfo] != ' '))
443 nextinfo++; 486 nextinfo++;
444 487
445 if (nextinfo - info >= 49) /*Erroneous info asked */ 488 if (nextinfo - info >= 49) /*Erroneous info asked */
446 continue; 489 continue;
447 490
448 strncpy (command, &(buf[info]), nextinfo - info); 491 memcpy (command, buf + info, nextinfo - info);
449 command[nextinfo - info] = '\0'; 492 command [nextinfo - info] = 0;
493
450 /* 2. Interpret info */ 494 /* 2. Interpret info */
451 i = sscanf (command, "%d", &flag); 495 i = sscanf (command, "%d", &flag);
452 496
453 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST)) 497 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
454 ns->supported_readables |= (1 << flag); 498 ns->supported_readables |= (1 << flag);
… …
488 return; 532 return;
489 533
490 buf++; 534 buf++;
491 } 535 }
492 536
493 execute_newserver_command (pl->ob, (char *) buf); 537 execute_newserver_command (pl->ob, (char *)buf);
494 538
495 /* Perhaps something better should be done with a left over count. 539 /* Perhaps something better should be done with a left over count.
496 * Cleaning up the input should probably be done first - all actions 540 * Cleaning up the input should probably be done first - all actions
497 * 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
498 * commands. 542 * commands.
… …
532 * commands. 576 * commands.
533 */ 577 */
534 pl->count = 0; 578 pl->count = 0;
535 579
536 //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
537 int time = fabs (pl->ob->speed) < 0.001 581 int time = pl->ob->has_active_speed ()
538 ? time = MAX_TIME * 100
539 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 582 ? (int) (MAX_TIME / pl->ob->speed)
583 : MAX_TIME * 100;
540 584
541 /* Send confirmation of command execution now */ 585 /* Send confirmation of command execution now */
542 packet sl ("comc"); 586 packet sl ("comc");
543 sl << uint16 (cmdid) << uint32 (time); 587 sl << uint16 (cmdid) << uint32 (time);
544 pl->ns->send_packet (sl); 588 pl->ns->send_packet (sl);
… …
690 * Get player's current range attack in obuf. 734 * Get player's current range attack in obuf.
691 */ 735 */
692static void 736static void
693rangetostring (player *pl, char *obuf) 737rangetostring (player *pl, char *obuf)
694{ 738{
695 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
696 750
697 if (pl->ranged_ob) 751 if (pl->ranged_ob)
698 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;
699 753
700 if (pl->combat_ob) 754 if (pl->combat_ob)
… …
794 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 848 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
795 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 849 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
796 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 850 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
797 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 851 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
798 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 852 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
799 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);
800 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 854 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
801 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);
802 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);
803 857
804 flags = 0; 858 flags = 0;
805 859
806 if (opl->fire_on) 860 if (opl->fire_on)
… …
809 if (opl->run_on) 863 if (opl->run_on)
810 flags |= SF_RUNON; 864 flags |= SF_RUNON;
811 865
812 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 866 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
813 867
814 if (ns->sc_version < 1025)
815 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
816 else
817 for (int i = 0; i < NROFATTACKS; i++) 868 for (int i = 0; i < NROFATTACKS; i++)
818 { 869 {
819 /* Skip ones we won't send */ 870 /* Skip ones we won't send */
820 if (atnr_cs_stat[i] == -1) 871 if (atnr_cs_stat[i] == -1)
821 continue; 872 continue;
822 873
823 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]);
824 } 875 }
825 876
826 if (pl->ns->monitor_spells) 877 if (pl->ns->monitor_spells)
827 { 878 {
828 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);
829 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);
… …
931 982
932 /* Nothing changed */ 983 /* Nothing changed */
933 return 0; 984 return 0;
934} 985}
935 986
987//-GPL
988
936// prefetch (and touch) all maps within a specific distancd 989// prefetch (and touch) all maps within a specific distancd
937static void 990static void
938prefetch_surrounding_maps (maptile *map, int distance) 991prefetch_surrounding_maps (maptile *map, int distance)
939{ 992{
940 map->last_access = runtime; 993 map->touch ();
941 994
942 if (--distance) 995 if (--distance)
943 for (int dir = 4; --dir; ) 996 for (int dir = 4; dir--; )
944 if (const shstr &path = map->tile_path [dir]) 997 if (const shstr &path = map->tile_path [dir])
945 if (maptile *&neigh = map->tile_map [dir]) 998 if (maptile *&neigh = map->tile_map [dir])
946 prefetch_surrounding_maps (neigh, distance); 999 prefetch_surrounding_maps (neigh, distance);
947 else 1000 else
948 neigh = maptile::find_async (path, map); 1001 neigh = maptile::find_async (path, map);
… …
953prefetch_surrounding_maps (object *op) 1006prefetch_surrounding_maps (object *op)
954{ 1007{
955 prefetch_surrounding_maps (op->map, 3); 1008 prefetch_surrounding_maps (op->map, 3);
956} 1009}
957 1010
1011//+GPL
1012
958/** 1013/**
959 * Draws client map. 1014 * Draws client map.
960 */ 1015 */
961void 1016void
962draw_client_map (player *pl) 1017draw_client_map (player *pl)
963{ 1018{
964 object *ob = pl->observe; 1019 object *ob = pl->viewpoint;
965 if (!ob->active) 1020 if (!pl->observe->active)
966 return; 1021 return;
967 1022
968 /* 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
969 * 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
970 * be OK once they really log in. 1025 * be OK once they really log in.
… …
977 check_map_change (pl); 1032 check_map_change (pl);
978 prefetch_surrounding_maps (pl->ob); 1033 prefetch_surrounding_maps (pl->ob);
979 1034
980 /* do LOS after calls to update_position */ 1035 /* do LOS after calls to update_position */
981 /* unfortunately, we need to udpate los when observing, currently */ 1036 /* unfortunately, we need to udpate los when observing, currently */
982 if (pl->do_los || pl->observe != pl->ob) 1037 if (pl->do_los || pl->viewpoint != pl->ob)
983 { 1038 {
984 pl->do_los = 0; 1039 pl->do_los = 0;
985 pl->update_los (); 1040 pl->update_los ();
986 } 1041 }
987 1042
… …
1039 map_clearcell (&lastcell, -1); 1094 map_clearcell (&lastcell, -1);
1040 } 1095 }
1041 1096
1042 continue; 1097 continue;
1043 } 1098 }
1044 1099
1045 int d = pl->blocked_los_uc (dx, dy); 1100 int d = pl->blocked_los_uc (dx, dy);
1046 1101
1047 if (d > 3) 1102 if (d > 3)
1048 { 1103 {
1049 /* This block deals with spaces that are not visible for whatever 1104 /* This block deals with spaces that are not visible for whatever
… …
1082 1137
1083 unsigned char dummy; 1138 unsigned char dummy;
1084 unsigned char *last_ext = &dummy; 1139 unsigned char *last_ext = &dummy;
1085 1140
1086 /* Darkness changed */ 1141 /* Darkness changed */
1087 if (lastcell.count != d && socket.darkness) 1142 if (lastcell.count != d)
1088 { 1143 {
1089 mask |= 0x8; 1144 mask |= 0x8;
1090 1145
1091 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)
1092 { 1198 {
1093 *last_ext |= 0x80; 1199 *last_ext |= 0x80;
1094 last_ext = &sl[sl.length ()]; 1200 last_ext = &sl[sl.length ()];
1095 sl << uint8 (d);
1096 }
1097 else
1098 sl << uint8 (255 - 64 * d);
1099 }
1100 1201
1101 lastcell.count = d;
1102
1103 mapspace &ms = m->at (nx, ny);
1104 ms.update ();
1105
1106 if (expect_true (socket.extmap))
1107 {
1108 uint8 stat_hp = 0;
1109 uint8 stat_width = 0;
1110 uint8 flags = 0;
1111 tag_t player = 0;
1112
1113 // send hp information, if applicable
1114 if (object *op = ms.faces_obj [0])
1115 if (op->is_head () && !op->invisible)
1116 {
1117 if (op->stats.maxhp > op->stats.hp
1118 && op->stats.maxhp > 0
1119 && (op->type == PLAYER
1120 || op->type == DOOR // does not work, have maxhp 0
1121 || QUERY_FLAG (op, FLAG_MONSTER)
1122 || QUERY_FLAG (op, FLAG_ALIVE)
1123 || QUERY_FLAG (op, FLAG_GENERATOR)))
1124 {
1125 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1126 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1127 }
1128
1129 if (expect_false (op->has_dialogue ()))
1130 flags |= 1;
1131
1132 if (expect_false (op->type == PLAYER))
1133 player = op == ob ? pl->ob->count
1134 : op == pl->ob ? ob->count
1135 : op->count;
1136 }
1137
1138 if (expect_false (lastcell.stat_hp != stat_hp))
1139 {
1140 lastcell.stat_hp = stat_hp;
1141
1142 mask |= 0x8;
1143 *last_ext |= 0x80;
1144 last_ext = &sl[sl.length ()];
1145
1146 sl << uint8 (5) << uint8 (stat_hp);
1147
1148 if (stat_width > 1)
1149 {
1150 *last_ext |= 0x80;
1151 last_ext = &sl[sl.length ()];
1152
1153 sl << uint8 (6) << uint8 (stat_width); 1202 sl << uint8 (6) << uint8 (stat_width);
1154 }
1155 }
1156
1157 if (expect_false (lastcell.player != player))
1158 {
1159 lastcell.player = player;
1160
1161 mask |= 0x8;
1162 *last_ext |= 0x80;
1163 last_ext = &sl[sl.length ()];
1164
1165 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1166 }
1167
1168 if (expect_false (lastcell.flags != flags))
1169 {
1170 lastcell.flags = flags;
1171
1172 mask |= 0x8;
1173 *last_ext |= 0x80;
1174 last_ext = &sl[sl.length ()];
1175
1176 sl << uint8 (8) << uint8 (flags);
1177 } 1203 }
1178 } 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
1179 1229
1180 /* Floor face */ 1230 /* Floor face */
1181 if (update_space (sl, socket, ms, lastcell, 2)) 1231 if (update_space (sl, socket, ms, lastcell, 2))
1182 mask |= 0x4; 1232 mask |= 0x4;
1183 1233
… …
1223 socket.send_packet (sl); 1273 socket.send_packet (sl);
1224 socket.sent_scroll = 0; 1274 socket.sent_scroll = 0;
1225 } 1275 }
1226} 1276}
1227 1277
1228/*****************************************************************************/
1229/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1230/* a player. Of course, the client need to know the command to be able to */
1231/* manage it ! */
1232/*****************************************************************************/
1233void
1234send_plugin_custom_message (object *pl, char *buf)
1235{
1236 pl->contr->ns->send_packet (buf);
1237}
1238
1239/**
1240 * This sends the skill number to name mapping. We ignore
1241 * the params - we always send the same info no matter what.
1242 */
1243void
1244send_skill_info (client *ns, char *params)
1245{
1246 packet sl;
1247 sl << "replyinfo skill_info\n";
1248
1249 for (int i = 1; i < NUM_SKILLS; i++)
1250 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1251
1252 if (sl.length () > MAXSOCKBUF)
1253 {
1254 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1255 fatal (0);
1256 }
1257
1258 ns->send_packet (sl);
1259}
1260
1261/**
1262 * This sends the spell path to name mapping. We ignore
1263 * the params - we always send the same info no matter what.
1264 */
1265void
1266send_spell_paths (client * ns, char *params)
1267{
1268 packet sl;
1269
1270 sl << "replyinfo spell_paths\n";
1271
1272 for (int i = 0; i < NRSPELLPATHS; i++)
1273 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1274
1275 if (sl.length () > MAXSOCKBUF)
1276 {
1277 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1278 fatal (0);
1279 }
1280
1281 ns->send_packet (sl);
1282}
1283
1284/** 1278/**
1285 * 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.
1286 * 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
1287 */ 1281 */
1288void 1282void
1289esrv_update_spells (player *pl) 1283esrv_update_spells (player *pl)
1290{ 1284{
1291 if (!pl->ns) 1285 if (!pl->ns)
1292 return; 1286 return;
1293 1287
1288 pl->ns->update_spells = false;
1289
1294 if (!pl->ns->monitor_spells) 1290 if (!pl->ns->monitor_spells)
1295 return; 1291 return;
1296 1292
1297 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1293 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1298 {
1299 if (spell->type == SPELL) 1294 if (spell->type == SPELL)
1300 { 1295 {
1301 int flags = 0; 1296 int flags = 0;
1297 int val;
1302 1298
1303 /* check if we need to update it */ 1299 /* check if we need to update it */
1304 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)
1305 { 1302 {
1306 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1303 spell->cached_sp = val;
1307 flags |= UPD_SP_MANA; 1304 flags |= UPD_SP_MANA;
1308 } 1305 }
1309 1306
1310 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)
1311 { 1309 {
1312 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1310 spell->cached_grace = val;
1313 flags |= UPD_SP_GRACE; 1311 flags |= UPD_SP_GRACE;
1314 } 1312 }
1315 1313
1316 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)
1317 { 1316 {
1318 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1317 spell->cached_eat = val;
1319 flags |= UPD_SP_DAMAGE; 1318 flags |= UPD_SP_LEVEL;
1320 } 1319 }
1321 1320
1322 if (flags) 1321 if (flags)
1323 { 1322 {
1324 packet sl; 1323 packet sl;
1325 1324
1326 sl << "updspell " 1325 sl << "updspell "
1327 << uint8 (flags) 1326 << uint8 (flags)
1328 << uint32 (spell->count); 1327 << uint32 (spell->count);
1329 1328
1330 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); 1329 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1331 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); 1330 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1332 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); 1331 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1333 1332
1334 pl->ns->send_packet (sl); 1333 pl->ns->send_packet (sl);
1335 } 1334 }
1336 } 1335 }
1337 }
1338} 1336}
1339 1337
1340void 1338void
1341esrv_remove_spell (player *pl, object *spell) 1339esrv_remove_spell (player *pl, object *spell)
1342{ 1340{
… …
1369 } 1367 }
1370 1368
1371 /* 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 */
1372 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);
1373 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);
1374 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1372 spell->cached_eat = casting_level (pl->ob, spell);
1375 1373
1376 /* figure out which skill it uses, if it uses one */ 1374 /* figure out which skill it uses, if it uses one */
1377 if (spell->skill) 1375 if (spell->skill)
1378 if (object *tmp = pl->find_skill (spell->skill)) 1376 if (object *tmp = pl->find_skill (spell->skill))
1379 skill = tmp->subtype + CS_STAT_SKILLINFO; 1377 skill = tmp->subtype + CS_STAT_SKILLINFO;
… …
1468 /* finally, we can send the packet */ 1466 /* finally, we can send the packet */
1469 pl->ns->flush_fx (); 1467 pl->ns->flush_fx ();
1470 pl->ns->send_packet (sl); 1468 pl->ns->send_packet (sl);
1471} 1469}
1472 1470
1471//-GPL
1472

Diff Legend

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