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.152 by root, Tue Oct 20 07:18:11 2009 UTC vs.
Revision 1.156 by root, Fri Nov 6 12:49:19 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
… …
64 * This table translates the attack numbers as used within the 66 * This table translates the attack numbers as used within the
65 * 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
66 * 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
67 * client. 69 * client.
68 */ 70 */
69short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS, 71static short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,
70 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,
71 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,
72 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ , 74 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,
73 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 75 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,
74 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,
… …
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));
… …
237 { 239 {
238 *params++ = 0; 240 *params++ = 0;
239 break; 241 break;
240 } 242 }
241 243
242 if (!strcmp (buf, "image_info"))
243 send_image_info (ns, params);
244 else if (!strcmp (buf, "image_sums"))
245 send_image_sums (ns, params);
246 else if (!strcmp (buf, "skill_info")) 244 if (!strcmp (buf, "skill_info"))
247 send_skill_info (ns, params); 245 send_skill_info (ns, params);
248 else if (!strcmp (buf, "spell_paths")) 246 else if (!strcmp (buf, "spell_paths"))
249 send_spell_paths (ns, params); 247 send_spell_paths (ns, params);
250 else 248 else
251 { 249 {
… …
267ExtiCmd (char *buf, int len, client *ns) 265ExtiCmd (char *buf, int len, client *ns)
268{ 266{
269 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 267 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
270} 268}
271 269
270//-GPL
271
272void 272void
273client::mapinfo_queue_clear () 273client::mapinfo_queue_clear ()
274{ 274{
275 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) 275 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
276 free (*i); 276 free (*i);
… …
283{ 283{
284 char *token = buf; 284 char *token = buf;
285 buf += strlen (buf) + 9; 285 buf += strlen (buf) + 9;
286 286
287 // initial map and its origin 287 // initial map and its origin
288 maptile *map = pl->observe->map; 288 maptile *map = pl->viewpoint->map;
289 int mapx = pl->ns->mapx / 2 - pl->observe->x; 289 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
290 int mapy = pl->ns->mapy / 2 - pl->observe->y; 290 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
291 int max_distance = 8; // limit maximum path length to something generous 291 int max_distance = 8; // limit maximum path length to something generous
292 292
293 while (*buf && map && max_distance) 293 while (*buf && map && max_distance)
294 { 294 {
295 int dir = *buf++ - '1'; 295 int dir = *buf++ - '1';
… …
399void 399void
400AddMeCmd (char *buf, int len, client *ns) 400AddMeCmd (char *buf, int len, client *ns)
401{ 401{
402 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 402 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
403} 403}
404
405//+GPL
404 406
405/* 407/*
406#define MSG_TYPE_BOOK 1 408#define MSG_TYPE_BOOK 1
407#define MSG_TYPE_CARD 2 409#define MSG_TYPE_CARD 2
408#define MSG_TYPE_PAPER 3 410#define MSG_TYPE_PAPER 3
… …
928 930
929 /* Nothing changed */ 931 /* Nothing changed */
930 return 0; 932 return 0;
931} 933}
932 934
935//-GPL
936
933// prefetch (and touch) all maps within a specific distancd 937// prefetch (and touch) all maps within a specific distancd
934static void 938static void
935prefetch_surrounding_maps (maptile *map, int distance) 939prefetch_surrounding_maps (maptile *map, int distance)
936{ 940{
937 map->touch (); 941 map->touch ();
… …
950prefetch_surrounding_maps (object *op) 954prefetch_surrounding_maps (object *op)
951{ 955{
952 prefetch_surrounding_maps (op->map, 3); 956 prefetch_surrounding_maps (op->map, 3);
953} 957}
954 958
959//+GPL
960
955/** 961/**
956 * Draws client map. 962 * Draws client map.
957 */ 963 */
958void 964void
959draw_client_map (player *pl) 965draw_client_map (player *pl)
960{ 966{
961 object *ob = pl->observe; 967 object *ob = pl->viewpoint;
962 if (!ob->active) 968 if (!pl->observe->active)
963 return; 969 return;
964 970
965 /* 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
966 * 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
967 * be OK once they really log in. 973 * be OK once they really log in.
… …
974 check_map_change (pl); 980 check_map_change (pl);
975 prefetch_surrounding_maps (pl->ob); 981 prefetch_surrounding_maps (pl->ob);
976 982
977 /* do LOS after calls to update_position */ 983 /* do LOS after calls to update_position */
978 /* unfortunately, we need to udpate los when observing, currently */ 984 /* unfortunately, we need to udpate los when observing, currently */
979 if (pl->do_los || pl->observe != pl->ob) 985 if (pl->do_los || pl->viewpoint != pl->ob)
980 { 986 {
981 pl->do_los = 0; 987 pl->do_los = 0;
982 pl->update_los (); 988 pl->update_los ();
983 } 989 }
984 990
… …
1460 /* finally, we can send the packet */ 1466 /* finally, we can send the packet */
1461 pl->ns->flush_fx (); 1467 pl->ns->flush_fx ();
1462 pl->ns->send_packet (sl); 1468 pl->ns->send_packet (sl);
1463} 1469}
1464 1470
1471//-GPL
1472

Diff Legend

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