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.157 by root, Fri Nov 6 13:05:57 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));
… …
215 socket.floorbox_reset (); 217 socket.floorbox_reset ();
216 } 218 }
217 219
218 socket.current_x = ob->x; 220 socket.current_x = ob->x;
219 socket.current_y = ob->y; 221 socket.current_y = ob->y;
222}
223
224/**
225 * This sends the skill number to name mapping. We ignore
226 * the params - we always send the same info no matter what.
227 */
228void
229send_skill_info (client *ns, char *params)
230{
231 packet sl;
232 sl << "replyinfo skill_info\n";
233
234 for (int i = 1; i < NUM_SKILLS; i++)
235 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
236
237 if (sl.length () > MAXSOCKBUF)
238 {
239 LOG (llevError, "Buffer overflow in send_skill_info!\n");
240 fatal (0);
241 }
242
243 ns->send_packet (sl);
244}
245
246/**
247 * This sends the spell path to name mapping. We ignore
248 * the params - we always send the same info no matter what.
249 */
250void
251send_spell_paths (client * ns, char *params)
252{
253 packet sl;
254
255 sl << "replyinfo spell_paths\n";
256
257 for (int i = 0; i < NRSPELLPATHS; i++)
258 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
259
260 if (sl.length () > MAXSOCKBUF)
261 {
262 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
263 fatal (0);
264 }
265
266 ns->send_packet (sl);
220} 267}
221 268
222/** 269/**
223 * RequestInfo is sort of a meta command. There is some specific 270 * RequestInfo is sort of a meta command. There is some specific
224 * request of information, but we call other functions to provide 271 * request of information, but we call other functions to provide
… …
263ExtiCmd (char *buf, int len, client *ns) 310ExtiCmd (char *buf, int len, client *ns)
264{ 311{
265 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 312 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
266} 313}
267 314
315//-GPL
316
268void 317void
269client::mapinfo_queue_clear () 318client::mapinfo_queue_clear ()
270{ 319{
271 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) 320 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
272 free (*i); 321 free (*i);
… …
279{ 328{
280 char *token = buf; 329 char *token = buf;
281 buf += strlen (buf) + 9; 330 buf += strlen (buf) + 9;
282 331
283 // initial map and its origin 332 // initial map and its origin
284 maptile *map = pl->observe->map; 333 maptile *map = pl->viewpoint->map;
285 int mapx = pl->ns->mapx / 2 - pl->observe->x; 334 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
286 int mapy = pl->ns->mapy / 2 - pl->observe->y; 335 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
287 int max_distance = 8; // limit maximum path length to something generous 336 int max_distance = 8; // limit maximum path length to something generous
288 337
289 while (*buf && map && max_distance) 338 while (*buf && map && max_distance)
290 { 339 {
291 int dir = *buf++ - '1'; 340 int dir = *buf++ - '1';
… …
395void 444void
396AddMeCmd (char *buf, int len, client *ns) 445AddMeCmd (char *buf, int len, client *ns)
397{ 446{
398 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 447 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
399} 448}
449
450//+GPL
400 451
401/* 452/*
402#define MSG_TYPE_BOOK 1 453#define MSG_TYPE_BOOK 1
403#define MSG_TYPE_CARD 2 454#define MSG_TYPE_CARD 2
404#define MSG_TYPE_PAPER 3 455#define MSG_TYPE_PAPER 3
… …
924 975
925 /* Nothing changed */ 976 /* Nothing changed */
926 return 0; 977 return 0;
927} 978}
928 979
980//-GPL
981
929// prefetch (and touch) all maps within a specific distancd 982// prefetch (and touch) all maps within a specific distancd
930static void 983static void
931prefetch_surrounding_maps (maptile *map, int distance) 984prefetch_surrounding_maps (maptile *map, int distance)
932{ 985{
933 map->touch (); 986 map->touch ();
… …
946prefetch_surrounding_maps (object *op) 999prefetch_surrounding_maps (object *op)
947{ 1000{
948 prefetch_surrounding_maps (op->map, 3); 1001 prefetch_surrounding_maps (op->map, 3);
949} 1002}
950 1003
1004//+GPL
1005
951/** 1006/**
952 * Draws client map. 1007 * Draws client map.
953 */ 1008 */
954void 1009void
955draw_client_map (player *pl) 1010draw_client_map (player *pl)
956{ 1011{
957 object *ob = pl->observe; 1012 object *ob = pl->viewpoint;
958 if (!ob->active) 1013 if (!pl->observe->active)
959 return; 1014 return;
960 1015
961 /* If player is just joining the game, he isn't here yet, so the map 1016 /* 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 1017 * can get swapped out. If so, don't try to send them a map. All will
963 * be OK once they really log in. 1018 * be OK once they really log in.
… …
970 check_map_change (pl); 1025 check_map_change (pl);
971 prefetch_surrounding_maps (pl->ob); 1026 prefetch_surrounding_maps (pl->ob);
972 1027
973 /* do LOS after calls to update_position */ 1028 /* do LOS after calls to update_position */
974 /* unfortunately, we need to udpate los when observing, currently */ 1029 /* unfortunately, we need to udpate los when observing, currently */
975 if (pl->do_los || pl->observe != pl->ob) 1030 if (pl->do_los || pl->viewpoint != pl->ob)
976 { 1031 {
977 pl->do_los = 0; 1032 pl->do_los = 0;
978 pl->update_los (); 1033 pl->update_los ();
979 } 1034 }
980 1035
… …
1223{ 1278{
1224 pl->contr->ns->send_packet (buf); 1279 pl->contr->ns->send_packet (buf);
1225} 1280}
1226 1281
1227/** 1282/**
1228 * This sends the skill number to name mapping. We ignore
1229 * the params - we always send the same info no matter what.
1230 */
1231void
1232send_skill_info (client *ns, char *params)
1233{
1234 packet sl;
1235 sl << "replyinfo skill_info\n";
1236
1237 for (int i = 1; i < NUM_SKILLS; i++)
1238 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1239
1240 if (sl.length () > MAXSOCKBUF)
1241 {
1242 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1243 fatal (0);
1244 }
1245
1246 ns->send_packet (sl);
1247}
1248
1249/**
1250 * This sends the spell path to name mapping. We ignore
1251 * the params - we always send the same info no matter what.
1252 */
1253void
1254send_spell_paths (client * ns, char *params)
1255{
1256 packet sl;
1257
1258 sl << "replyinfo spell_paths\n";
1259
1260 for (int i = 0; i < NRSPELLPATHS; i++)
1261 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1262
1263 if (sl.length () > MAXSOCKBUF)
1264 {
1265 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1266 fatal (0);
1267 }
1268
1269 ns->send_packet (sl);
1270}
1271
1272/**
1273 * This looks for any spells the player may have that have changed their stats. 1283 * This looks for any spells the player may have that have changed their stats.
1274 * it then sends an updspell packet for each spell that has changed in this way 1284 * it then sends an updspell packet for each spell that has changed in this way
1275 */ 1285 */
1276void 1286void
1277esrv_update_spells (player *pl) 1287esrv_update_spells (player *pl)
… …
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