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.158 by root, Fri Nov 6 13:11:28 2009 UTC

3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 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.
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 ();
749 740
750 if (pl->ranged_ob) 741 if (pl->ranged_ob)
751 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;
752 743
753 if (pl->combat_ob) 744 if (pl->combat_ob)
984 975
985 /* Nothing changed */ 976 /* Nothing changed */
986 return 0; 977 return 0;
987} 978}
988 979
989/** 980//-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 981
1008// prefetch (and touch) all maps within a specific distancd 982// prefetch (and touch) all maps within a specific distancd
1009static void 983static void
1010prefetch_surrounding_maps (maptile *map, int distance) 984prefetch_surrounding_maps (maptile *map, int distance)
1011{ 985{
1012 map->last_access = runtime; 986 map->touch ();
1013 987
1014 if (--distance) 988 if (--distance)
1015 for (int dir = 4; --dir; ) 989 for (int dir = 4; --dir; )
1016 if (const shstr &path = map->tile_path [dir]) 990 if (const shstr &path = map->tile_path [dir])
1017 if (maptile *&neigh = map->tile_map [dir]) 991 if (maptile *&neigh = map->tile_map [dir])
1025prefetch_surrounding_maps (object *op) 999prefetch_surrounding_maps (object *op)
1026{ 1000{
1027 prefetch_surrounding_maps (op->map, 3); 1001 prefetch_surrounding_maps (op->map, 3);
1028} 1002}
1029 1003
1004//+GPL
1005
1030/** 1006/**
1031 * Draws client map. 1007 * Draws client map.
1032 */ 1008 */
1033void 1009void
1034draw_client_map (player *pl) 1010draw_client_map (player *pl)
1035{ 1011{
1036 object *ob = pl->observe; 1012 object *ob = pl->viewpoint;
1037 if (!ob->active) 1013 if (!pl->observe->active)
1038 return; 1014 return;
1039 1015
1040 /* If player is just joining the game, he isn't here yet, so the map 1016 /* 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 1017 * can get swapped out. If so, don't try to send them a map. All will
1042 * be OK once they really log in. 1018 * be OK once they really log in.
1043 */ 1019 */
1044 if (!ob->map || ob->map->in_memory != MAP_ACTIVE) 1020 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1045 return; 1021 return;
1046 1022
1047 int startlen, oldlen; 1023 int startlen, oldlen;
1048 int estartlen, eoldlen;
1049 uint8 eentrysize;
1050 uint16 ewhatstart, ewhatflag;
1051 uint8 extendedinfos;
1052 1024
1053 check_map_change (pl); 1025 check_map_change (pl);
1054 prefetch_surrounding_maps (pl->ob); 1026 prefetch_surrounding_maps (pl->ob);
1055 1027
1056 /* do LOS after calls to update_position */ 1028 /* do LOS after calls to update_position */
1057 /* unfortunately, we need to udpate los when observing, currently */ 1029 /* unfortunately, we need to udpate los when observing, currently */
1058 if (pl->do_los || pl->observe != pl->ob) 1030 if (pl->do_los || pl->viewpoint != pl->ob)
1059 { 1031 {
1060 pl->do_los = 0; 1032 pl->do_los = 0;
1061 pl->update_los (); 1033 pl->update_los ();
1062 } 1034 }
1063 1035
1085 */ 1057 */
1086 1058
1087 client &socket = *pl->ns; 1059 client &socket = *pl->ns;
1088 1060
1089 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1061 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1090 packet esl;
1091 1062
1092 startlen = sl.length (); 1063 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 1064
1113 int hx = socket.mapx / 2; 1065 int hx = socket.mapx / 2;
1114 int hy = socket.mapy / 2; 1066 int hy = socket.mapy / 2;
1115 1067
1116 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy) 1068 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1117 int ax = dx + hx; 1069 int ax = dx + hx;
1118 int ay = dy + hy; 1070 int ay = dy + hy;
1119 1071
1120 int emask, mask;
1121 emask = mask = (ax << 10) | (ay << 4); 1072 int mask = (ax << 10) | (ay << 4);
1122
1123 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1073 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1124 1074
1125 /* If the coordinates are not valid, or it is too dark to see, 1075 /* If the coordinates are not valid, or it is too dark to see,
1126 * we tell the client as such 1076 * we tell the client as such
1127 */ 1077 */
1173 * I think this is simpler than doing a bunch of checks to see 1123 * 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 1124 * what if anything we need to send, setting the bits, then
1175 * doing those checks again to add the real data. 1125 * doing those checks again to add the real data.
1176 */ 1126 */
1177 oldlen = sl.length (); 1127 oldlen = sl.length ();
1178 eoldlen = esl.length ();
1179 1128
1180 sl << uint16 (mask); 1129 sl << uint16 (mask);
1181 1130
1182 unsigned char dummy; 1131 unsigned char dummy;
1183 unsigned char *last_ext = &dummy; 1132 unsigned char *last_ext = &dummy;
1184 1133
1185 /* Darkness changed */ 1134 /* Darkness changed */
1186 if (lastcell.count != d && socket.darkness) 1135 if (lastcell.count != d)
1187 { 1136 {
1188 mask |= 0x8; 1137 mask |= 0x8;
1189 1138
1190 if (socket.extmap) 1139 *last_ext |= 0x80;
1140 last_ext = &sl[sl.length ()];
1141 sl << uint8 (d);
1142 }
1143
1144 lastcell.count = d;
1145
1146 mapspace &ms = m->at (nx, ny);
1147 ms.update ();
1148
1149 // extmap handling
1150 uint8 stat_hp = 0;
1151 uint8 stat_width = 0;
1152 uint8 flags = 0;
1153 tag_t player = 0;
1154
1155 // send hp information, if applicable
1156 if (object *op = ms.faces_obj [0])
1157 if (op->is_head () && !op->invisible)
1158 {
1159 if (op->stats.maxhp > op->stats.hp
1160 && op->stats.maxhp > 0
1161 && (op->type == PLAYER
1162 || op->type == DOOR // does not work, have maxhp 0
1163 || QUERY_FLAG (op, FLAG_MONSTER)
1164 || QUERY_FLAG (op, FLAG_ALIVE)
1165 || QUERY_FLAG (op, FLAG_GENERATOR)))
1166 {
1167 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1168 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1169 }
1170
1171 if (expect_false (op->has_dialogue ()))
1172 flags |= 1;
1173
1174 if (expect_false (op->type == PLAYER))
1175 player = op == ob ? pl->ob->count
1176 : op == pl->ob ? ob->count
1177 : op->count;
1178 }
1179
1180 if (expect_false (lastcell.stat_hp != stat_hp))
1181 {
1182 lastcell.stat_hp = stat_hp;
1183
1184 mask |= 0x8;
1185 *last_ext |= 0x80;
1186 last_ext = &sl[sl.length ()];
1187
1188 sl << uint8 (5) << uint8 (stat_hp);
1189
1190 if (stat_width > 1)
1191 { 1191 {
1192 *last_ext |= 0x80; 1192 *last_ext |= 0x80;
1193 last_ext = &sl[sl.length ()]; 1193 last_ext = &sl[sl.length ()];
1194 sl << uint8 (d);
1195 }
1196 else
1197 sl << uint8 (255 - 64 * d);
1198 }
1199 1194
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); 1195 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 } 1196 }
1277 } 1197 }
1198
1199 if (expect_false (lastcell.player != player))
1200 {
1201 lastcell.player = player;
1202
1203 mask |= 0x8;
1204 *last_ext |= 0x80;
1205 last_ext = &sl[sl.length ()];
1206
1207 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1208 }
1209
1210 if (expect_false (lastcell.flags != flags))
1211 {
1212 lastcell.flags = flags;
1213
1214 mask |= 0x8;
1215 *last_ext |= 0x80;
1216 last_ext = &sl[sl.length ()];
1217
1218 sl << uint8 (8) << uint8 (flags);
1219 }
1220
1221 // faces
1278 1222
1279 /* Floor face */ 1223 /* Floor face */
1280 if (update_space (sl, socket, ms, lastcell, 2)) 1224 if (update_space (sl, socket, ms, lastcell, 2))
1281 mask |= 0x4; 1225 mask |= 0x4;
1282 1226
1310 */ 1254 */
1311 if (mask & 0xf) 1255 if (mask & 0xf)
1312 sl[oldlen + 1] = mask & 0xff; 1256 sl[oldlen + 1] = mask & 0xff;
1313 else 1257 else
1314 sl.reset (oldlen); 1258 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 */ 1259 } /* else this is a viewable space */
1345 ordered_mapwalk_end 1260 ordered_mapwalk_end
1346 1261
1347 socket.flush_fx (); 1262 socket.flush_fx ();
1348 1263
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) 1264 if (sl.length () > startlen || socket.sent_scroll)
1366 { 1265 {
1367 socket.send_packet (sl); 1266 socket.send_packet (sl);
1368 socket.sent_scroll = 0; 1267 socket.sent_scroll = 0;
1369 } 1268 }
1370}
1371
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} 1269}
1427 1270
1428/** 1271/**
1429 * This looks for any spells the player may have that have changed their stats. 1272 * 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 1273 * it then sends an updspell packet for each spell that has changed in this way
1612 /* finally, we can send the packet */ 1455 /* finally, we can send the packet */
1613 pl->ns->flush_fx (); 1456 pl->ns->flush_fx ();
1614 pl->ns->send_packet (sl); 1457 pl->ns->send_packet (sl);
1615} 1458}
1616 1459
1460//-GPL
1461

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines