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.155 by root, Thu Nov 5 16:03:07 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 *
… …
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;
224} 222}
… …
241 { 239 {
242 *params++ = 0; 240 *params++ = 0;
243 break; 241 break;
244 } 242 }
245 243
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")) 244 if (!strcmp (buf, "skill_info"))
251 send_skill_info (ns, params); 245 send_skill_info (ns, params);
252 else if (!strcmp (buf, "spell_paths")) 246 else if (!strcmp (buf, "spell_paths"))
253 send_spell_paths (ns, params); 247 send_spell_paths (ns, params);
254 else 248 else
255 { 249 {
… …
271ExtiCmd (char *buf, int len, client *ns) 265ExtiCmd (char *buf, int len, client *ns)
272{ 266{
273 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 267 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
274} 268}
275 269
270//-GPL
271
276void 272void
277client::mapinfo_queue_clear () 273client::mapinfo_queue_clear ()
278{ 274{
279 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) 275 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
280 free (*i); 276 free (*i);
… …
287{ 283{
288 char *token = buf; 284 char *token = buf;
289 buf += strlen (buf) + 9; 285 buf += strlen (buf) + 9;
290 286
291 // initial map and its origin 287 // initial map and its origin
292 maptile *map = pl->observe->map; 288 maptile *map = pl->viewpoint->map;
293 int mapx = pl->ns->mapx / 2 - pl->observe->x; 289 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
294 int mapy = pl->ns->mapy / 2 - pl->observe->y; 290 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
295 int max_distance = 8; // limit maximum path length to something generous 291 int max_distance = 8; // limit maximum path length to something generous
296 292
297 while (*buf && map && max_distance) 293 while (*buf && map && max_distance)
298 { 294 {
299 int dir = *buf++ - '1'; 295 int dir = *buf++ - '1';
… …
404AddMeCmd (char *buf, int len, client *ns) 400AddMeCmd (char *buf, int len, client *ns)
405{ 401{
406 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 402 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
407} 403}
408 404
405//+GPL
406
409/* 407/*
410#define MSG_TYPE_BOOK 1 408#define MSG_TYPE_BOOK 1
411#define MSG_TYPE_CARD 2 409#define MSG_TYPE_CARD 2
412#define MSG_TYPE_PAPER 3 410#define MSG_TYPE_PAPER 3
413#define MSG_TYPE_SIGN 4 411#define MSG_TYPE_SIGN 4
… …
429 while (1) 427 while (1)
430 { 428 {
431 /* 1. Extract an info */ 429 /* 1. Extract an info */
432 info = nextinfo; 430 info = nextinfo;
433 431
434 while ((info < len) && (buf[info] == ' ')) 432 while ((info < len) && (buf [info] == ' '))
435 info++; 433 info++;
436 434
437 if (info >= len) 435 if (info >= len)
438 break; 436 break;
439 437
440 nextinfo = info + 1; 438 nextinfo = info + 1;
441 439
442 while ((nextinfo < len) && (buf[nextinfo] != ' ')) 440 while ((nextinfo < len) && (buf [nextinfo] != ' '))
443 nextinfo++; 441 nextinfo++;
444 442
445 if (nextinfo - info >= 49) /*Erroneous info asked */ 443 if (nextinfo - info >= 49) /*Erroneous info asked */
446 continue; 444 continue;
447 445
448 strncpy (command, &(buf[info]), nextinfo - info); 446 memcpy (command, buf + info, nextinfo - info);
449 command[nextinfo - info] = '\0'; 447 command [nextinfo - info] = 0;
448
450 /* 2. Interpret info */ 449 /* 2. Interpret info */
451 i = sscanf (command, "%d", &flag); 450 i = sscanf (command, "%d", &flag);
452 451
453 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST)) 452 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
454 ns->supported_readables |= (1 << flag); 453 ns->supported_readables |= (1 << flag);
… …
488 return; 487 return;
489 488
490 buf++; 489 buf++;
491 } 490 }
492 491
493 execute_newserver_command (pl->ob, (char *) buf); 492 execute_newserver_command (pl->ob, (char *)buf);
494 493
495 /* Perhaps something better should be done with a left over count. 494 /* Perhaps something better should be done with a left over count.
496 * Cleaning up the input should probably be done first - all actions 495 * 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 496 * for the command that issued the count should be done before any other
498 * commands. 497 * commands.
… …
690 * Get player's current range attack in obuf. 689 * Get player's current range attack in obuf.
691 */ 690 */
692static void 691static void
693rangetostring (player *pl, char *obuf) 692rangetostring (player *pl, char *obuf)
694{ 693{
695 dynbuf_text buf; 694 dynbuf_text &buf = msg_dynbuf; buf.clear ();
696 695
697 if (pl->ranged_ob) 696 if (pl->ranged_ob)
698 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 697 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
699 698
700 if (pl->combat_ob) 699 if (pl->combat_ob)
… …
931 930
932 /* Nothing changed */ 931 /* Nothing changed */
933 return 0; 932 return 0;
934} 933}
935 934
935//-GPL
936
936// prefetch (and touch) all maps within a specific distancd 937// prefetch (and touch) all maps within a specific distancd
937static void 938static void
938prefetch_surrounding_maps (maptile *map, int distance) 939prefetch_surrounding_maps (maptile *map, int distance)
939{ 940{
940 map->last_access = runtime; 941 map->touch ();
941 942
942 if (--distance) 943 if (--distance)
943 for (int dir = 4; --dir; ) 944 for (int dir = 4; --dir; )
944 if (const shstr &path = map->tile_path [dir]) 945 if (const shstr &path = map->tile_path [dir])
945 if (maptile *&neigh = map->tile_map [dir]) 946 if (maptile *&neigh = map->tile_map [dir])
… …
953prefetch_surrounding_maps (object *op) 954prefetch_surrounding_maps (object *op)
954{ 955{
955 prefetch_surrounding_maps (op->map, 3); 956 prefetch_surrounding_maps (op->map, 3);
956} 957}
957 958
959//+GPL
960
958/** 961/**
959 * Draws client map. 962 * Draws client map.
960 */ 963 */
961void 964void
962draw_client_map (player *pl) 965draw_client_map (player *pl)
963{ 966{
964 object *ob = pl->observe; 967 object *ob = pl->viewpoint;
965 if (!ob->active) 968 if (!pl->observe->active)
966 return; 969 return;
967 970
968 /* If player is just joining the game, he isn't here yet, so the map 971 /* 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 972 * can get swapped out. If so, don't try to send them a map. All will
970 * be OK once they really log in. 973 * be OK once they really log in.
… …
977 check_map_change (pl); 980 check_map_change (pl);
978 prefetch_surrounding_maps (pl->ob); 981 prefetch_surrounding_maps (pl->ob);
979 982
980 /* do LOS after calls to update_position */ 983 /* do LOS after calls to update_position */
981 /* unfortunately, we need to udpate los when observing, currently */ 984 /* unfortunately, we need to udpate los when observing, currently */
982 if (pl->do_los || pl->observe != pl->ob) 985 if (pl->do_los || pl->viewpoint != pl->ob)
983 { 986 {
984 pl->do_los = 0; 987 pl->do_los = 0;
985 pl->update_los (); 988 pl->update_los ();
986 } 989 }
987 990
… …
1082 1085
1083 unsigned char dummy; 1086 unsigned char dummy;
1084 unsigned char *last_ext = &dummy; 1087 unsigned char *last_ext = &dummy;
1085 1088
1086 /* Darkness changed */ 1089 /* Darkness changed */
1087 if (lastcell.count != d && socket.darkness) 1090 if (lastcell.count != d)
1088 { 1091 {
1089 mask |= 0x8; 1092 mask |= 0x8;
1090 1093
1091 if (socket.extmap) 1094 *last_ext |= 0x80;
1095 last_ext = &sl[sl.length ()];
1096 sl << uint8 (d);
1097 }
1098
1099 lastcell.count = d;
1100
1101 mapspace &ms = m->at (nx, ny);
1102 ms.update ();
1103
1104 // extmap handling
1105 uint8 stat_hp = 0;
1106 uint8 stat_width = 0;
1107 uint8 flags = 0;
1108 tag_t player = 0;
1109
1110 // send hp information, if applicable
1111 if (object *op = ms.faces_obj [0])
1112 if (op->is_head () && !op->invisible)
1113 {
1114 if (op->stats.maxhp > op->stats.hp
1115 && op->stats.maxhp > 0
1116 && (op->type == PLAYER
1117 || op->type == DOOR // does not work, have maxhp 0
1118 || QUERY_FLAG (op, FLAG_MONSTER)
1119 || QUERY_FLAG (op, FLAG_ALIVE)
1120 || QUERY_FLAG (op, FLAG_GENERATOR)))
1121 {
1122 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1123 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1124 }
1125
1126 if (expect_false (op->has_dialogue ()))
1127 flags |= 1;
1128
1129 if (expect_false (op->type == PLAYER))
1130 player = op == ob ? pl->ob->count
1131 : op == pl->ob ? ob->count
1132 : op->count;
1133 }
1134
1135 if (expect_false (lastcell.stat_hp != stat_hp))
1136 {
1137 lastcell.stat_hp = stat_hp;
1138
1139 mask |= 0x8;
1140 *last_ext |= 0x80;
1141 last_ext = &sl[sl.length ()];
1142
1143 sl << uint8 (5) << uint8 (stat_hp);
1144
1145 if (stat_width > 1)
1092 { 1146 {
1093 *last_ext |= 0x80; 1147 *last_ext |= 0x80;
1094 last_ext = &sl[sl.length ()]; 1148 last_ext = &sl[sl.length ()];
1095 sl << uint8 (d);
1096 }
1097 else
1098 sl << uint8 (255 - 64 * d);
1099 }
1100 1149
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); 1150 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 } 1151 }
1178 } 1152 }
1153
1154 if (expect_false (lastcell.player != player))
1155 {
1156 lastcell.player = player;
1157
1158 mask |= 0x8;
1159 *last_ext |= 0x80;
1160 last_ext = &sl[sl.length ()];
1161
1162 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1163 }
1164
1165 if (expect_false (lastcell.flags != flags))
1166 {
1167 lastcell.flags = flags;
1168
1169 mask |= 0x8;
1170 *last_ext |= 0x80;
1171 last_ext = &sl[sl.length ()];
1172
1173 sl << uint8 (8) << uint8 (flags);
1174 }
1175
1176 // faces
1179 1177
1180 /* Floor face */ 1178 /* Floor face */
1181 if (update_space (sl, socket, ms, lastcell, 2)) 1179 if (update_space (sl, socket, ms, lastcell, 2))
1182 mask |= 0x4; 1180 mask |= 0x4;
1183 1181
… …
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