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.146 by root, Sat Dec 27 01:25:00 2008 UTC vs.
Revision 1.165 by root, Fri Mar 26 01:04:45 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));
… …
214 socket.floorbox_reset (); 217 socket.floorbox_reset ();
215 } 218 }
216 219
217 socket.current_x = ob->x; 220 socket.current_x = ob->x;
218 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);
219} 267}
220 268
221/** 269/**
222 * RequestInfo is sort of a meta command. There is some specific 270 * RequestInfo is sort of a meta command. There is some specific
223 * request of information, but we call other functions to provide 271 * request of information, but we call other functions to provide
… …
236 { 284 {
237 *params++ = 0; 285 *params++ = 0;
238 break; 286 break;
239 } 287 }
240 288
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")) 289 if (!strcmp (buf, "skill_info"))
246 send_skill_info (ns, params); 290 send_skill_info (ns, params);
247 else if (!strcmp (buf, "spell_paths")) 291 else if (!strcmp (buf, "spell_paths"))
248 send_spell_paths (ns, params); 292 send_spell_paths (ns, params);
249 else 293 else
250 { 294 {
… …
266ExtiCmd (char *buf, int len, client *ns) 310ExtiCmd (char *buf, int len, client *ns)
267{ 311{
268 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 312 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
269} 313}
270 314
315//-GPL
316
271void 317void
272client::mapinfo_queue_clear () 318client::mapinfo_queue_clear ()
273{ 319{
274 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) 320 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
275 free (*i); 321 free (*i);
… …
282{ 328{
283 char *token = buf; 329 char *token = buf;
284 buf += strlen (buf) + 9; 330 buf += strlen (buf) + 9;
285 331
286 // initial map and its origin 332 // initial map and its origin
287 maptile *map = pl->observe->map; 333 maptile *map = pl->viewpoint->map;
288 int mapx = pl->ns->mapx / 2 - pl->observe->x; 334 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
289 int mapy = pl->ns->mapy / 2 - pl->observe->y; 335 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
290 int max_distance = 8; // limit maximum path length to something generous 336 int max_distance = 8; // limit maximum path length to something generous
291 337
292 while (*buf && map && max_distance) 338 while (*buf && map && max_distance)
293 { 339 {
294 int dir = *buf++ - '1'; 340 int dir = *buf++ - '1';
… …
399AddMeCmd (char *buf, int len, client *ns) 445AddMeCmd (char *buf, int len, client *ns)
400{ 446{
401 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 447 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
402} 448}
403 449
450//+GPL
451
404/* 452/*
405#define MSG_TYPE_BOOK 1 453#define MSG_TYPE_BOOK 1
406#define MSG_TYPE_CARD 2 454#define MSG_TYPE_CARD 2
407#define MSG_TYPE_PAPER 3 455#define MSG_TYPE_PAPER 3
408#define MSG_TYPE_SIGN 4 456#define MSG_TYPE_SIGN 4
… …
424 while (1) 472 while (1)
425 { 473 {
426 /* 1. Extract an info */ 474 /* 1. Extract an info */
427 info = nextinfo; 475 info = nextinfo;
428 476
429 while ((info < len) && (buf[info] == ' ')) 477 while ((info < len) && (buf [info] == ' '))
430 info++; 478 info++;
431 479
432 if (info >= len) 480 if (info >= len)
433 break; 481 break;
434 482
435 nextinfo = info + 1; 483 nextinfo = info + 1;
436 484
437 while ((nextinfo < len) && (buf[nextinfo] != ' ')) 485 while ((nextinfo < len) && (buf [nextinfo] != ' '))
438 nextinfo++; 486 nextinfo++;
439 487
440 if (nextinfo - info >= 49) /*Erroneous info asked */ 488 if (nextinfo - info >= 49) /*Erroneous info asked */
441 continue; 489 continue;
442 490
443 strncpy (command, &(buf[info]), nextinfo - info); 491 memcpy (command, buf + info, nextinfo - info);
444 command[nextinfo - info] = '\0'; 492 command [nextinfo - info] = 0;
493
445 /* 2. Interpret info */ 494 /* 2. Interpret info */
446 i = sscanf (command, "%d", &flag); 495 i = sscanf (command, "%d", &flag);
447 496
448 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST)) 497 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
449 ns->supported_readables |= (1 << flag); 498 ns->supported_readables |= (1 << flag);
… …
483 return; 532 return;
484 533
485 buf++; 534 buf++;
486 } 535 }
487 536
488 execute_newserver_command (pl->ob, (char *) buf); 537 execute_newserver_command (pl->ob, (char *)buf);
489 538
490 /* Perhaps something better should be done with a left over count. 539 /* Perhaps something better should be done with a left over count.
491 * Cleaning up the input should probably be done first - all actions 540 * Cleaning up the input should probably be done first - all actions
492 * 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
493 * commands. 542 * commands.
… …
527 * commands. 576 * commands.
528 */ 577 */
529 pl->count = 0; 578 pl->count = 0;
530 579
531 //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
532 int time = fabs (pl->ob->speed) < 0.001 581 int time = pl->ob->has_active_speed ()
533 ? time = MAX_TIME * 100
534 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 582 ? (int) (MAX_TIME / pl->ob->speed)
583 : MAX_TIME * 100;
535 584
536 /* Send confirmation of command execution now */ 585 /* Send confirmation of command execution now */
537 packet sl ("comc"); 586 packet sl ("comc");
538 sl << uint16 (cmdid) << uint32 (time); 587 sl << uint16 (cmdid) << uint32 (time);
539 pl->ns->send_packet (sl); 588 pl->ns->send_packet (sl);
… …
685 * Get player's current range attack in obuf. 734 * Get player's current range attack in obuf.
686 */ 735 */
687static void 736static void
688rangetostring (player *pl, char *obuf) 737rangetostring (player *pl, char *obuf)
689{ 738{
690 dynbuf_text buf; 739 dynbuf_text &buf = msg_dynbuf; buf.clear ();
691 740
692 if (pl->ranged_ob) 741 if (pl->ranged_ob)
693 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 742 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
694 743
695 if (pl->combat_ob) 744 if (pl->combat_ob)
… …
789 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
790 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 839 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
791 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 840 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
792 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 841 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
793 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 842 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
794 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK); 843 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
795 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
796 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); 845 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
797 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 846 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
798 847
799 flags = 0; 848 flags = 0;
800 849
801 if (opl->fire_on) 850 if (opl->fire_on)
… …
804 if (opl->run_on) 853 if (opl->run_on)
805 flags |= SF_RUNON; 854 flags |= SF_RUNON;
806 855
807 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 856 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
808 857
809 if (ns->sc_version < 1025)
810 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
811 else
812 for (int i = 0; i < NROFATTACKS; i++) 858 for (int i = 0; i < NROFATTACKS; i++)
813 { 859 {
814 /* Skip ones we won't send */ 860 /* Skip ones we won't send */
815 if (atnr_cs_stat[i] == -1) 861 if (atnr_cs_stat[i] == -1)
816 continue; 862 continue;
817 863
818 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 864 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
819 } 865 }
820 866
821 if (pl->ns->monitor_spells) 867 if (pl->ns->monitor_spells)
822 { 868 {
823 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 869 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
824 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 870 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
… …
926 972
927 /* Nothing changed */ 973 /* Nothing changed */
928 return 0; 974 return 0;
929} 975}
930 976
977//-GPL
978
931// prefetch (and touch) all maps within a specific distancd 979// prefetch (and touch) all maps within a specific distancd
932static void 980static void
933prefetch_surrounding_maps (maptile *map, int distance) 981prefetch_surrounding_maps (maptile *map, int distance)
934{ 982{
935 map->last_access = runtime; 983 map->touch ();
936 984
937 if (--distance) 985 if (--distance)
938 for (int dir = 4; --dir; ) 986 for (int dir = 4; dir--; )
939 if (const shstr &path = map->tile_path [dir]) 987 if (const shstr &path = map->tile_path [dir])
940 if (maptile *&neigh = map->tile_map [dir]) 988 if (maptile *&neigh = map->tile_map [dir])
941 prefetch_surrounding_maps (neigh, distance); 989 prefetch_surrounding_maps (neigh, distance);
942 else 990 else
943 neigh = maptile::find_async (path, map); 991 neigh = maptile::find_async (path, map);
… …
948prefetch_surrounding_maps (object *op) 996prefetch_surrounding_maps (object *op)
949{ 997{
950 prefetch_surrounding_maps (op->map, 3); 998 prefetch_surrounding_maps (op->map, 3);
951} 999}
952 1000
1001//+GPL
1002
953/** 1003/**
954 * Draws client map. 1004 * Draws client map.
955 */ 1005 */
956void 1006void
957draw_client_map (player *pl) 1007draw_client_map (player *pl)
958{ 1008{
959 object *ob = pl->observe; 1009 object *ob = pl->viewpoint;
960 if (!ob->active) 1010 if (!pl->observe->active)
961 return; 1011 return;
962 1012
963 /* If player is just joining the game, he isn't here yet, so the map 1013 /* If player is just joining the game, he isn't here yet, so the map
964 * can get swapped out. If so, don't try to send them a map. All will 1014 * can get swapped out. If so, don't try to send them a map. All will
965 * be OK once they really log in. 1015 * be OK once they really log in.
… …
972 check_map_change (pl); 1022 check_map_change (pl);
973 prefetch_surrounding_maps (pl->ob); 1023 prefetch_surrounding_maps (pl->ob);
974 1024
975 /* do LOS after calls to update_position */ 1025 /* do LOS after calls to update_position */
976 /* unfortunately, we need to udpate los when observing, currently */ 1026 /* unfortunately, we need to udpate los when observing, currently */
977 if (pl->do_los || pl->observe != pl->ob) 1027 if (pl->do_los || pl->viewpoint != pl->ob)
978 { 1028 {
979 pl->do_los = 0; 1029 pl->do_los = 0;
980 pl->update_los (); 1030 pl->update_los ();
981 } 1031 }
982 1032
… …
1034 map_clearcell (&lastcell, -1); 1084 map_clearcell (&lastcell, -1);
1035 } 1085 }
1036 1086
1037 continue; 1087 continue;
1038 } 1088 }
1039 1089
1040 int d = pl->blocked_los_uc (dx, dy); 1090 int d = pl->blocked_los_uc (dx, dy);
1041 1091
1042 if (d > 3) 1092 if (d > 3)
1043 { 1093 {
1044 /* This block deals with spaces that are not visible for whatever 1094 /* This block deals with spaces that are not visible for whatever
… …
1081 /* Darkness changed */ 1131 /* Darkness changed */
1082 if (lastcell.count != d) 1132 if (lastcell.count != d)
1083 { 1133 {
1084 mask |= 0x8; 1134 mask |= 0x8;
1085 1135
1086 if (socket.extmap) 1136 *last_ext |= 0x80;
1137 last_ext = &sl[sl.length ()];
1138 sl << uint8 (d);
1139 }
1140
1141 lastcell.count = d;
1142
1143 mapspace &ms = m->at (nx, ny);
1144 ms.update ();
1145
1146 // extmap handling
1147 uint8 stat_hp = 0;
1148 uint8 stat_width = 0;
1149 uint8 flags = 0;
1150 tag_t player = 0;
1151
1152 // send hp information, if applicable
1153 if (object *op = ms.faces_obj [0])
1154 if (op->is_head () && !op->invisible)
1155 {
1156 if (op->stats.maxhp > op->stats.hp
1157 && op->stats.maxhp > 0
1158 && (op->type == PLAYER
1159 || op->type == DOOR // does not work, have maxhp 0
1160 || QUERY_FLAG (op, FLAG_MONSTER)
1161 || QUERY_FLAG (op, FLAG_ALIVE)
1162 || QUERY_FLAG (op, FLAG_GENERATOR)))
1163 {
1164 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1165 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1166 }
1167
1168 if (expect_false (op->has_dialogue ()))
1169 flags |= 1;
1170
1171 if (expect_false (op->type == PLAYER))
1172 player = op == ob ? pl->ob->count
1173 : op == pl->ob ? ob->count
1174 : op->count;
1175 }
1176
1177 if (expect_false (lastcell.stat_hp != stat_hp))
1178 {
1179 lastcell.stat_hp = stat_hp;
1180
1181 mask |= 0x8;
1182 *last_ext |= 0x80;
1183 last_ext = &sl[sl.length ()];
1184
1185 sl << uint8 (5) << uint8 (stat_hp);
1186
1187 if (stat_width > 1)
1087 { 1188 {
1088 *last_ext |= 0x80; 1189 *last_ext |= 0x80;
1089 last_ext = &sl[sl.length ()]; 1190 last_ext = &sl[sl.length ()];
1090 sl << uint8 (d);
1091 }
1092 else
1093 sl << uint8 (255 - 64 * d);
1094 }
1095 1191
1096 lastcell.count = d;
1097
1098 mapspace &ms = m->at (nx, ny);
1099 ms.update ();
1100
1101 if (expect_true (socket.extmap))
1102 {
1103 uint8 stat_hp = 0;
1104 uint8 stat_width = 0;
1105 uint8 flags = 0;
1106 tag_t player = 0;
1107
1108 // send hp information, if applicable
1109 if (object *op = ms.faces_obj [0])
1110 if (op->is_head () && !op->invisible)
1111 {
1112 if (op->stats.maxhp > op->stats.hp
1113 && op->stats.maxhp > 0
1114 && (op->type == PLAYER
1115 || op->type == DOOR // does not work, have maxhp 0
1116 || QUERY_FLAG (op, FLAG_MONSTER)
1117 || QUERY_FLAG (op, FLAG_ALIVE)
1118 || QUERY_FLAG (op, FLAG_GENERATOR)))
1119 {
1120 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1121 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1122 }
1123
1124 if (expect_false (op->has_dialogue ()))
1125 flags |= 1;
1126
1127 if (expect_false (op->type == PLAYER))
1128 player = op == ob ? pl->ob->count
1129 : op == pl->ob ? ob->count
1130 : op->count;
1131 }
1132
1133 if (expect_false (lastcell.stat_hp != stat_hp))
1134 {
1135 lastcell.stat_hp = stat_hp;
1136
1137 mask |= 0x8;
1138 *last_ext |= 0x80;
1139 last_ext = &sl[sl.length ()];
1140
1141 sl << uint8 (5) << uint8 (stat_hp);
1142
1143 if (stat_width > 1)
1144 {
1145 *last_ext |= 0x80;
1146 last_ext = &sl[sl.length ()];
1147
1148 sl << uint8 (6) << uint8 (stat_width); 1192 sl << uint8 (6) << uint8 (stat_width);
1149 }
1150 }
1151
1152 if (expect_false (lastcell.player != player))
1153 {
1154 lastcell.player = player;
1155
1156 mask |= 0x8;
1157 *last_ext |= 0x80;
1158 last_ext = &sl[sl.length ()];
1159
1160 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1161 }
1162
1163 if (expect_false (lastcell.flags != flags))
1164 {
1165 lastcell.flags = flags;
1166
1167 mask |= 0x8;
1168 *last_ext |= 0x80;
1169 last_ext = &sl[sl.length ()];
1170
1171 sl << uint8 (8) << uint8 (flags);
1172 } 1193 }
1173 } 1194 }
1195
1196 if (expect_false (lastcell.player != player))
1197 {
1198 lastcell.player = player;
1199
1200 mask |= 0x8;
1201 *last_ext |= 0x80;
1202 last_ext = &sl[sl.length ()];
1203
1204 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1205 }
1206
1207 if (expect_false (lastcell.flags != flags))
1208 {
1209 lastcell.flags = flags;
1210
1211 mask |= 0x8;
1212 *last_ext |= 0x80;
1213 last_ext = &sl[sl.length ()];
1214
1215 sl << uint8 (8) << uint8 (flags);
1216 }
1217
1218 // faces
1174 1219
1175 /* Floor face */ 1220 /* Floor face */
1176 if (update_space (sl, socket, ms, lastcell, 2)) 1221 if (update_space (sl, socket, ms, lastcell, 2))
1177 mask |= 0x4; 1222 mask |= 0x4;
1178 1223
… …
1218 socket.send_packet (sl); 1263 socket.send_packet (sl);
1219 socket.sent_scroll = 0; 1264 socket.sent_scroll = 0;
1220 } 1265 }
1221} 1266}
1222 1267
1223/*****************************************************************************/
1224/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1225/* a player. Of course, the client need to know the command to be able to */
1226/* manage it ! */
1227/*****************************************************************************/
1228void
1229send_plugin_custom_message (object *pl, char *buf)
1230{
1231 pl->contr->ns->send_packet (buf);
1232}
1233
1234/**
1235 * This sends the skill number to name mapping. We ignore
1236 * the params - we always send the same info no matter what.
1237 */
1238void
1239send_skill_info (client *ns, char *params)
1240{
1241 packet sl;
1242 sl << "replyinfo skill_info\n";
1243
1244 for (int i = 1; i < NUM_SKILLS; i++)
1245 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1246
1247 if (sl.length () > MAXSOCKBUF)
1248 {
1249 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1250 fatal (0);
1251 }
1252
1253 ns->send_packet (sl);
1254}
1255
1256/**
1257 * This sends the spell path to name mapping. We ignore
1258 * the params - we always send the same info no matter what.
1259 */
1260void
1261send_spell_paths (client * ns, char *params)
1262{
1263 packet sl;
1264
1265 sl << "replyinfo spell_paths\n";
1266
1267 for (int i = 0; i < NRSPELLPATHS; i++)
1268 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1269
1270 if (sl.length () > MAXSOCKBUF)
1271 {
1272 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1273 fatal (0);
1274 }
1275
1276 ns->send_packet (sl);
1277}
1278
1279/** 1268/**
1280 * This looks for any spells the player may have that have changed their stats. 1269 * This looks for any spells the player may have that have changed their stats.
1281 * it then sends an updspell packet for each spell that has changed in this way 1270 * it then sends an updspell packet for each spell that has changed in this way
1282 */ 1271 */
1283void 1272void
1284esrv_update_spells (player *pl) 1273esrv_update_spells (player *pl)
1285{ 1274{
1286 if (!pl->ns) 1275 if (!pl->ns)
1287 return; 1276 return;
1288 1277
1278 pl->ns->update_spells = false;
1279
1289 if (!pl->ns->monitor_spells) 1280 if (!pl->ns->monitor_spells)
1290 return; 1281 return;
1291 1282
1292 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1283 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1293 {
1294 if (spell->type == SPELL) 1284 if (spell->type == SPELL)
1295 { 1285 {
1296 int flags = 0; 1286 int flags = 0;
1287 int val;
1297 1288
1298 /* check if we need to update it */ 1289 /* check if we need to update it */
1299 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1290 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1291 if (spell->cached_sp != val)
1300 { 1292 {
1301 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1293 spell->cached_sp = val;
1302 flags |= UPD_SP_MANA; 1294 flags |= UPD_SP_MANA;
1303 } 1295 }
1304 1296
1305 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1297 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1298 if (spell->cached_grace != val)
1306 { 1299 {
1307 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1300 spell->cached_grace = val;
1308 flags |= UPD_SP_GRACE; 1301 flags |= UPD_SP_GRACE;
1309 } 1302 }
1310 1303
1311 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1304 val = casting_level (pl->ob, spell);
1305 if (spell->cached_eat != val)
1312 { 1306 {
1313 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1307 spell->cached_eat = val;
1314 flags |= UPD_SP_DAMAGE; 1308 flags |= UPD_SP_LEVEL;
1315 } 1309 }
1316 1310
1317 if (flags) 1311 if (flags)
1318 { 1312 {
1319 packet sl; 1313 packet sl;
1320 1314
1321 sl << "updspell " 1315 sl << "updspell "
1322 << uint8 (flags) 1316 << uint8 (flags)
1323 << uint32 (spell->count); 1317 << uint32 (spell->count);
1324 1318
1325 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); 1319 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1326 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); 1320 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1327 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); 1321 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1328 1322
1329 pl->ns->send_packet (sl); 1323 pl->ns->send_packet (sl);
1330 } 1324 }
1331 } 1325 }
1332 }
1333} 1326}
1334 1327
1335void 1328void
1336esrv_remove_spell (player *pl, object *spell) 1329esrv_remove_spell (player *pl, object *spell)
1337{ 1330{
… …
1364 } 1357 }
1365 1358
1366 /* store costs and damage in the object struct, to compare to later */ 1359 /* store costs and damage in the object struct, to compare to later */
1367 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1360 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1368 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1361 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1369 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1362 spell->cached_eat = casting_level (pl->ob, spell);
1370 1363
1371 /* figure out which skill it uses, if it uses one */ 1364 /* figure out which skill it uses, if it uses one */
1372 if (spell->skill) 1365 if (spell->skill)
1373 if (object *tmp = pl->find_skill (spell->skill)) 1366 if (object *tmp = pl->find_skill (spell->skill))
1374 skill = tmp->subtype + CS_STAT_SKILLINFO; 1367 skill = tmp->subtype + CS_STAT_SKILLINFO;
… …
1463 /* finally, we can send the packet */ 1456 /* finally, we can send the packet */
1464 pl->ns->flush_fx (); 1457 pl->ns->flush_fx ();
1465 pl->ns->send_packet (sl); 1458 pl->ns->send_packet (sl);
1466} 1459}
1467 1460
1461//-GPL
1462

Diff Legend

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