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.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));
… …
236 { 239 {
237 *params++ = 0; 240 *params++ = 0;
238 break; 241 break;
239 } 242 }
240 243
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")) 244 if (!strcmp (buf, "skill_info"))
246 send_skill_info (ns, params); 245 send_skill_info (ns, params);
247 else if (!strcmp (buf, "spell_paths")) 246 else if (!strcmp (buf, "spell_paths"))
248 send_spell_paths (ns, params); 247 send_spell_paths (ns, params);
249 else 248 else
250 { 249 {
… …
266ExtiCmd (char *buf, int len, client *ns) 265ExtiCmd (char *buf, int len, client *ns)
267{ 266{
268 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 267 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
269} 268}
270 269
270//-GPL
271
271void 272void
272client::mapinfo_queue_clear () 273client::mapinfo_queue_clear ()
273{ 274{
274 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) 275 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
275 free (*i); 276 free (*i);
… …
282{ 283{
283 char *token = buf; 284 char *token = buf;
284 buf += strlen (buf) + 9; 285 buf += strlen (buf) + 9;
285 286
286 // initial map and its origin 287 // initial map and its origin
287 maptile *map = pl->observe->map; 288 maptile *map = pl->viewpoint->map;
288 int mapx = pl->ns->mapx / 2 - pl->observe->x; 289 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
289 int mapy = pl->ns->mapy / 2 - pl->observe->y; 290 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
290 int max_distance = 8; // limit maximum path length to something generous 291 int max_distance = 8; // limit maximum path length to something generous
291 292
292 while (*buf && map && max_distance) 293 while (*buf && map && max_distance)
293 { 294 {
294 int dir = *buf++ - '1'; 295 int dir = *buf++ - '1';
… …
399AddMeCmd (char *buf, int len, client *ns) 400AddMeCmd (char *buf, int len, client *ns)
400{ 401{
401 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 402 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
402} 403}
403 404
405//+GPL
406
404/* 407/*
405#define MSG_TYPE_BOOK 1 408#define MSG_TYPE_BOOK 1
406#define MSG_TYPE_CARD 2 409#define MSG_TYPE_CARD 2
407#define MSG_TYPE_PAPER 3 410#define MSG_TYPE_PAPER 3
408#define MSG_TYPE_SIGN 4 411#define MSG_TYPE_SIGN 4
… …
424 while (1) 427 while (1)
425 { 428 {
426 /* 1. Extract an info */ 429 /* 1. Extract an info */
427 info = nextinfo; 430 info = nextinfo;
428 431
429 while ((info < len) && (buf[info] == ' ')) 432 while ((info < len) && (buf [info] == ' '))
430 info++; 433 info++;
431 434
432 if (info >= len) 435 if (info >= len)
433 break; 436 break;
434 437
435 nextinfo = info + 1; 438 nextinfo = info + 1;
436 439
437 while ((nextinfo < len) && (buf[nextinfo] != ' ')) 440 while ((nextinfo < len) && (buf [nextinfo] != ' '))
438 nextinfo++; 441 nextinfo++;
439 442
440 if (nextinfo - info >= 49) /*Erroneous info asked */ 443 if (nextinfo - info >= 49) /*Erroneous info asked */
441 continue; 444 continue;
442 445
443 strncpy (command, &(buf[info]), nextinfo - info); 446 memcpy (command, buf + info, nextinfo - info);
444 command[nextinfo - info] = '\0'; 447 command [nextinfo - info] = 0;
448
445 /* 2. Interpret info */ 449 /* 2. Interpret info */
446 i = sscanf (command, "%d", &flag); 450 i = sscanf (command, "%d", &flag);
447 451
448 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST)) 452 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
449 ns->supported_readables |= (1 << flag); 453 ns->supported_readables |= (1 << flag);
… …
483 return; 487 return;
484 488
485 buf++; 489 buf++;
486 } 490 }
487 491
488 execute_newserver_command (pl->ob, (char *) buf); 492 execute_newserver_command (pl->ob, (char *)buf);
489 493
490 /* Perhaps something better should be done with a left over count. 494 /* Perhaps something better should be done with a left over count.
491 * Cleaning up the input should probably be done first - all actions 495 * 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 496 * for the command that issued the count should be done before any other
493 * commands. 497 * commands.
… …
685 * Get player's current range attack in obuf. 689 * Get player's current range attack in obuf.
686 */ 690 */
687static void 691static void
688rangetostring (player *pl, char *obuf) 692rangetostring (player *pl, char *obuf)
689{ 693{
690 dynbuf_text buf; 694 dynbuf_text &buf = msg_dynbuf; buf.clear ();
691 695
692 if (pl->ranged_ob) 696 if (pl->ranged_ob)
693 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;
694 698
695 if (pl->combat_ob) 699 if (pl->combat_ob)
… …
926 930
927 /* Nothing changed */ 931 /* Nothing changed */
928 return 0; 932 return 0;
929} 933}
930 934
935//-GPL
936
931// prefetch (and touch) all maps within a specific distancd 937// prefetch (and touch) all maps within a specific distancd
932static void 938static void
933prefetch_surrounding_maps (maptile *map, int distance) 939prefetch_surrounding_maps (maptile *map, int distance)
934{ 940{
935 map->last_access = runtime; 941 map->touch ();
936 942
937 if (--distance) 943 if (--distance)
938 for (int dir = 4; --dir; ) 944 for (int dir = 4; --dir; )
939 if (const shstr &path = map->tile_path [dir]) 945 if (const shstr &path = map->tile_path [dir])
940 if (maptile *&neigh = map->tile_map [dir]) 946 if (maptile *&neigh = map->tile_map [dir])
… …
948prefetch_surrounding_maps (object *op) 954prefetch_surrounding_maps (object *op)
949{ 955{
950 prefetch_surrounding_maps (op->map, 3); 956 prefetch_surrounding_maps (op->map, 3);
951} 957}
952 958
959//+GPL
960
953/** 961/**
954 * Draws client map. 962 * Draws client map.
955 */ 963 */
956void 964void
957draw_client_map (player *pl) 965draw_client_map (player *pl)
958{ 966{
959 object *ob = pl->observe; 967 object *ob = pl->viewpoint;
960 if (!ob->active) 968 if (!pl->observe->active)
961 return; 969 return;
962 970
963 /* 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
964 * 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
965 * be OK once they really log in. 973 * be OK once they really log in.
… …
972 check_map_change (pl); 980 check_map_change (pl);
973 prefetch_surrounding_maps (pl->ob); 981 prefetch_surrounding_maps (pl->ob);
974 982
975 /* do LOS after calls to update_position */ 983 /* do LOS after calls to update_position */
976 /* unfortunately, we need to udpate los when observing, currently */ 984 /* unfortunately, we need to udpate los when observing, currently */
977 if (pl->do_los || pl->observe != pl->ob) 985 if (pl->do_los || pl->viewpoint != pl->ob)
978 { 986 {
979 pl->do_los = 0; 987 pl->do_los = 0;
980 pl->update_los (); 988 pl->update_los ();
981 } 989 }
982 990
… …
1081 /* Darkness changed */ 1089 /* Darkness changed */
1082 if (lastcell.count != d) 1090 if (lastcell.count != d)
1083 { 1091 {
1084 mask |= 0x8; 1092 mask |= 0x8;
1085 1093
1086 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)
1087 { 1146 {
1088 *last_ext |= 0x80; 1147 *last_ext |= 0x80;
1089 last_ext = &sl[sl.length ()]; 1148 last_ext = &sl[sl.length ()];
1090 sl << uint8 (d);
1091 }
1092 else
1093 sl << uint8 (255 - 64 * d);
1094 }
1095 1149
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); 1150 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 } 1151 }
1173 } 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
1174 1177
1175 /* Floor face */ 1178 /* Floor face */
1176 if (update_space (sl, socket, ms, lastcell, 2)) 1179 if (update_space (sl, socket, ms, lastcell, 2))
1177 mask |= 0x4; 1180 mask |= 0x4;
1178 1181
… …
1463 /* finally, we can send the packet */ 1466 /* finally, we can send the packet */
1464 pl->ns->flush_fx (); 1467 pl->ns->flush_fx ();
1465 pl->ns->send_packet (sl); 1468 pl->ns->send_packet (sl);
1466} 1469}
1467 1470
1471//-GPL
1472

Diff Legend

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