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.154 by root, Wed Nov 4 17:24:00 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 */
23 24
24/** 25/**
… …
141 142
142static void 143static void
143send_map_info (player *pl) 144send_map_info (player *pl)
144{ 145{
145 client &socket = *pl->ns; 146 client &socket = *pl->ns;
146 object *ob = pl->observe; 147 object *ob = pl->viewpoint;
147 148
148 if (socket.mapinfocmd) 149 if (socket.mapinfocmd)
149 { 150 {
150 if (ob->map && ob->map->path[0]) 151 if (ob->map && ob->map->path[0])
151 { 152 {
… …
168/** check for map/region change and send new map data */ 169/** check for map/region change and send new map data */
169static void 170static void
170check_map_change (player *pl) 171check_map_change (player *pl)
171{ 172{
172 client &socket = *pl->ns; 173 client &socket = *pl->ns;
173 object *ob = pl->observe; 174 object *ob = pl->viewpoint;
174 175
175 region *reg = ob->region (); 176 region *reg = ob->region ();
176 if (socket.current_region != reg) 177 if (socket.current_region != reg)
177 { 178 {
178 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region)); 179 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) 209 else if (socket.current_x != ob->x || socket.current_y != ob->y)
209 { 210 {
210 int dx = ob->x - socket.current_x; 211 int dx = ob->x - socket.current_x;
211 int dy = ob->y - socket.current_y; 212 int dy = ob->y - socket.current_y;
212 213
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); 214 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
218 socket.floorbox_reset (); 215 socket.floorbox_reset ();
219 }
220 } 216 }
221 217
222 socket.current_x = ob->x; 218 socket.current_x = ob->x;
223 socket.current_y = ob->y; 219 socket.current_y = ob->y;
224} 220}
… …
241 { 237 {
242 *params++ = 0; 238 *params++ = 0;
243 break; 239 break;
244 } 240 }
245 241
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")) 242 if (!strcmp (buf, "skill_info"))
251 send_skill_info (ns, params); 243 send_skill_info (ns, params);
252 else if (!strcmp (buf, "spell_paths")) 244 else if (!strcmp (buf, "spell_paths"))
253 send_spell_paths (ns, params); 245 send_spell_paths (ns, params);
254 else 246 else
255 { 247 {
… …
287{ 279{
288 char *token = buf; 280 char *token = buf;
289 buf += strlen (buf) + 9; 281 buf += strlen (buf) + 9;
290 282
291 // initial map and its origin 283 // initial map and its origin
292 maptile *map = pl->observe->map; 284 maptile *map = pl->viewpoint->map;
293 int mapx = pl->ns->mapx / 2 - pl->observe->x; 285 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
294 int mapy = pl->ns->mapy / 2 - pl->observe->y; 286 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
295 int max_distance = 8; // limit maximum path length to something generous 287 int max_distance = 8; // limit maximum path length to something generous
296 288
297 while (*buf && map && max_distance) 289 while (*buf && map && max_distance)
298 { 290 {
299 int dir = *buf++ - '1'; 291 int dir = *buf++ - '1';
… …
429 while (1) 421 while (1)
430 { 422 {
431 /* 1. Extract an info */ 423 /* 1. Extract an info */
432 info = nextinfo; 424 info = nextinfo;
433 425
434 while ((info < len) && (buf[info] == ' ')) 426 while ((info < len) && (buf [info] == ' '))
435 info++; 427 info++;
436 428
437 if (info >= len) 429 if (info >= len)
438 break; 430 break;
439 431
440 nextinfo = info + 1; 432 nextinfo = info + 1;
441 433
442 while ((nextinfo < len) && (buf[nextinfo] != ' ')) 434 while ((nextinfo < len) && (buf [nextinfo] != ' '))
443 nextinfo++; 435 nextinfo++;
444 436
445 if (nextinfo - info >= 49) /*Erroneous info asked */ 437 if (nextinfo - info >= 49) /*Erroneous info asked */
446 continue; 438 continue;
447 439
448 strncpy (command, &(buf[info]), nextinfo - info); 440 memcpy (command, buf + info, nextinfo - info);
449 command[nextinfo - info] = '\0'; 441 command [nextinfo - info] = 0;
442
450 /* 2. Interpret info */ 443 /* 2. Interpret info */
451 i = sscanf (command, "%d", &flag); 444 i = sscanf (command, "%d", &flag);
452 445
453 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST)) 446 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
454 ns->supported_readables |= (1 << flag); 447 ns->supported_readables |= (1 << flag);
… …
488 return; 481 return;
489 482
490 buf++; 483 buf++;
491 } 484 }
492 485
493 execute_newserver_command (pl->ob, (char *) buf); 486 execute_newserver_command (pl->ob, (char *)buf);
494 487
495 /* Perhaps something better should be done with a left over count. 488 /* Perhaps something better should be done with a left over count.
496 * Cleaning up the input should probably be done first - all actions 489 * 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 490 * for the command that issued the count should be done before any other
498 * commands. 491 * commands.
… …
690 * Get player's current range attack in obuf. 683 * Get player's current range attack in obuf.
691 */ 684 */
692static void 685static void
693rangetostring (player *pl, char *obuf) 686rangetostring (player *pl, char *obuf)
694{ 687{
695 dynbuf_text buf; 688 dynbuf_text &buf = msg_dynbuf; buf.clear ();
696 689
697 if (pl->ranged_ob) 690 if (pl->ranged_ob)
698 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 691 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
699 692
700 if (pl->combat_ob) 693 if (pl->combat_ob)
… …
935 928
936// prefetch (and touch) all maps within a specific distancd 929// prefetch (and touch) all maps within a specific distancd
937static void 930static void
938prefetch_surrounding_maps (maptile *map, int distance) 931prefetch_surrounding_maps (maptile *map, int distance)
939{ 932{
940 map->last_access = runtime; 933 map->touch ();
941 934
942 if (--distance) 935 if (--distance)
943 for (int dir = 4; --dir; ) 936 for (int dir = 4; --dir; )
944 if (const shstr &path = map->tile_path [dir]) 937 if (const shstr &path = map->tile_path [dir])
945 if (maptile *&neigh = map->tile_map [dir]) 938 if (maptile *&neigh = map->tile_map [dir])
… …
959 * Draws client map. 952 * Draws client map.
960 */ 953 */
961void 954void
962draw_client_map (player *pl) 955draw_client_map (player *pl)
963{ 956{
964 object *ob = pl->observe; 957 object *ob = pl->viewpoint;
965 if (!ob->active) 958 if (!pl->observe->active)
966 return; 959 return;
967 960
968 /* If player is just joining the game, he isn't here yet, so the map 961 /* 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 962 * can get swapped out. If so, don't try to send them a map. All will
970 * be OK once they really log in. 963 * be OK once they really log in.
… …
977 check_map_change (pl); 970 check_map_change (pl);
978 prefetch_surrounding_maps (pl->ob); 971 prefetch_surrounding_maps (pl->ob);
979 972
980 /* do LOS after calls to update_position */ 973 /* do LOS after calls to update_position */
981 /* unfortunately, we need to udpate los when observing, currently */ 974 /* unfortunately, we need to udpate los when observing, currently */
982 if (pl->do_los || pl->observe != pl->ob) 975 if (pl->do_los || pl->viewpoint != pl->ob)
983 { 976 {
984 pl->do_los = 0; 977 pl->do_los = 0;
985 pl->update_los (); 978 pl->update_los ();
986 } 979 }
987 980
… …
1082 1075
1083 unsigned char dummy; 1076 unsigned char dummy;
1084 unsigned char *last_ext = &dummy; 1077 unsigned char *last_ext = &dummy;
1085 1078
1086 /* Darkness changed */ 1079 /* Darkness changed */
1087 if (lastcell.count != d && socket.darkness) 1080 if (lastcell.count != d)
1088 { 1081 {
1089 mask |= 0x8; 1082 mask |= 0x8;
1090 1083
1091 if (socket.extmap) 1084 *last_ext |= 0x80;
1085 last_ext = &sl[sl.length ()];
1086 sl << uint8 (d);
1087 }
1088
1089 lastcell.count = d;
1090
1091 mapspace &ms = m->at (nx, ny);
1092 ms.update ();
1093
1094 // extmap handling
1095 uint8 stat_hp = 0;
1096 uint8 stat_width = 0;
1097 uint8 flags = 0;
1098 tag_t player = 0;
1099
1100 // send hp information, if applicable
1101 if (object *op = ms.faces_obj [0])
1102 if (op->is_head () && !op->invisible)
1103 {
1104 if (op->stats.maxhp > op->stats.hp
1105 && op->stats.maxhp > 0
1106 && (op->type == PLAYER
1107 || op->type == DOOR // does not work, have maxhp 0
1108 || QUERY_FLAG (op, FLAG_MONSTER)
1109 || QUERY_FLAG (op, FLAG_ALIVE)
1110 || QUERY_FLAG (op, FLAG_GENERATOR)))
1111 {
1112 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1113 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1114 }
1115
1116 if (expect_false (op->has_dialogue ()))
1117 flags |= 1;
1118
1119 if (expect_false (op->type == PLAYER))
1120 player = op == ob ? pl->ob->count
1121 : op == pl->ob ? ob->count
1122 : op->count;
1123 }
1124
1125 if (expect_false (lastcell.stat_hp != stat_hp))
1126 {
1127 lastcell.stat_hp = stat_hp;
1128
1129 mask |= 0x8;
1130 *last_ext |= 0x80;
1131 last_ext = &sl[sl.length ()];
1132
1133 sl << uint8 (5) << uint8 (stat_hp);
1134
1135 if (stat_width > 1)
1092 { 1136 {
1093 *last_ext |= 0x80; 1137 *last_ext |= 0x80;
1094 last_ext = &sl[sl.length ()]; 1138 last_ext = &sl[sl.length ()];
1095 sl << uint8 (d);
1096 }
1097 else
1098 sl << uint8 (255 - 64 * d);
1099 }
1100 1139
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); 1140 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 } 1141 }
1178 } 1142 }
1143
1144 if (expect_false (lastcell.player != player))
1145 {
1146 lastcell.player = player;
1147
1148 mask |= 0x8;
1149 *last_ext |= 0x80;
1150 last_ext = &sl[sl.length ()];
1151
1152 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1153 }
1154
1155 if (expect_false (lastcell.flags != flags))
1156 {
1157 lastcell.flags = flags;
1158
1159 mask |= 0x8;
1160 *last_ext |= 0x80;
1161 last_ext = &sl[sl.length ()];
1162
1163 sl << uint8 (8) << uint8 (flags);
1164 }
1165
1166 // faces
1179 1167
1180 /* Floor face */ 1168 /* Floor face */
1181 if (update_space (sl, socket, ms, lastcell, 2)) 1169 if (update_space (sl, socket, ms, lastcell, 2))
1182 mask |= 0x4; 1170 mask |= 0x4;
1183 1171

Diff Legend

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