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.153 by root, Wed Nov 4 13:46:37 2009 UTC vs.
Revision 1.155 by root, Thu Nov 5 16:03:07 2009 UTC

… …
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * 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>
23 */ 23 */
24 24
25//+GPL
26
25/** 27/**
26 * \file 28 * \file
27 * Client handling. 29 * Client handling.
28 * 30 *
29 * \date 2003-12-02 31 * \date 2003-12-02
… …
142 144
143static void 145static void
144send_map_info (player *pl) 146send_map_info (player *pl)
145{ 147{
146 client &socket = *pl->ns; 148 client &socket = *pl->ns;
147 object *ob = pl->observe; 149 object *ob = pl->viewpoint;
148 150
149 if (socket.mapinfocmd) 151 if (socket.mapinfocmd)
150 { 152 {
151 if (ob->map && ob->map->path[0]) 153 if (ob->map && ob->map->path[0])
152 { 154 {
… …
169/** check for map/region change and send new map data */ 171/** check for map/region change and send new map data */
170static void 172static void
171check_map_change (player *pl) 173check_map_change (player *pl)
172{ 174{
173 client &socket = *pl->ns; 175 client &socket = *pl->ns;
174 object *ob = pl->observe; 176 object *ob = pl->viewpoint;
175 177
176 region *reg = ob->region (); 178 region *reg = ob->region ();
177 if (socket.current_region != reg) 179 if (socket.current_region != reg)
178 { 180 {
179 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));
… …
263ExtiCmd (char *buf, int len, client *ns) 265ExtiCmd (char *buf, int len, client *ns)
264{ 266{
265 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 267 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
266} 268}
267 269
270//-GPL
271
268void 272void
269client::mapinfo_queue_clear () 273client::mapinfo_queue_clear ()
270{ 274{
271 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) 275 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
272 free (*i); 276 free (*i);
… …
279{ 283{
280 char *token = buf; 284 char *token = buf;
281 buf += strlen (buf) + 9; 285 buf += strlen (buf) + 9;
282 286
283 // initial map and its origin 287 // initial map and its origin
284 maptile *map = pl->observe->map; 288 maptile *map = pl->viewpoint->map;
285 int mapx = pl->ns->mapx / 2 - pl->observe->x; 289 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
286 int mapy = pl->ns->mapy / 2 - pl->observe->y; 290 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
287 int max_distance = 8; // limit maximum path length to something generous 291 int max_distance = 8; // limit maximum path length to something generous
288 292
289 while (*buf && map && max_distance) 293 while (*buf && map && max_distance)
290 { 294 {
291 int dir = *buf++ - '1'; 295 int dir = *buf++ - '1';
… …
395void 399void
396AddMeCmd (char *buf, int len, client *ns) 400AddMeCmd (char *buf, int len, client *ns)
397{ 401{
398 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 402 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
399} 403}
404
405//+GPL
400 406
401/* 407/*
402#define MSG_TYPE_BOOK 1 408#define MSG_TYPE_BOOK 1
403#define MSG_TYPE_CARD 2 409#define MSG_TYPE_CARD 2
404#define MSG_TYPE_PAPER 3 410#define MSG_TYPE_PAPER 3
… …
924 930
925 /* Nothing changed */ 931 /* Nothing changed */
926 return 0; 932 return 0;
927} 933}
928 934
935//-GPL
936
929// prefetch (and touch) all maps within a specific distancd 937// prefetch (and touch) all maps within a specific distancd
930static void 938static void
931prefetch_surrounding_maps (maptile *map, int distance) 939prefetch_surrounding_maps (maptile *map, int distance)
932{ 940{
933 map->touch (); 941 map->touch ();
… …
946prefetch_surrounding_maps (object *op) 954prefetch_surrounding_maps (object *op)
947{ 955{
948 prefetch_surrounding_maps (op->map, 3); 956 prefetch_surrounding_maps (op->map, 3);
949} 957}
950 958
959//+GPL
960
951/** 961/**
952 * Draws client map. 962 * Draws client map.
953 */ 963 */
954void 964void
955draw_client_map (player *pl) 965draw_client_map (player *pl)
956{ 966{
957 object *ob = pl->observe; 967 object *ob = pl->viewpoint;
958 if (!ob->active) 968 if (!pl->observe->active)
959 return; 969 return;
960 970
961 /* 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
962 * 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
963 * be OK once they really log in. 973 * be OK once they really log in.
… …
970 check_map_change (pl); 980 check_map_change (pl);
971 prefetch_surrounding_maps (pl->ob); 981 prefetch_surrounding_maps (pl->ob);
972 982
973 /* do LOS after calls to update_position */ 983 /* do LOS after calls to update_position */
974 /* unfortunately, we need to udpate los when observing, currently */ 984 /* unfortunately, we need to udpate los when observing, currently */
975 if (pl->do_los || pl->observe != pl->ob) 985 if (pl->do_los || pl->viewpoint != pl->ob)
976 { 986 {
977 pl->do_los = 0; 987 pl->do_los = 0;
978 pl->update_los (); 988 pl->update_los ();
979 } 989 }
980 990
… …
1456 /* finally, we can send the packet */ 1466 /* finally, we can send the packet */
1457 pl->ns->flush_fx (); 1467 pl->ns->flush_fx ();
1458 pl->ns->send_packet (sl); 1468 pl->ns->send_packet (sl);
1459} 1469}
1460 1470
1471//-GPL
1472

Diff Legend

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