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.150 by root, Mon Oct 12 14:00:59 2009 UTC vs.
Revision 1.159 by root, Sat Nov 7 18:30:06 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 */
228static void
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 */
250static void
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
… …
237 { 284 {
238 *params++ = 0; 285 *params++ = 0;
239 break; 286 break;
240 } 287 }
241 288
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")) 289 if (!strcmp (buf, "skill_info"))
247 send_skill_info (ns, params); 290 send_skill_info (ns, params);
248 else if (!strcmp (buf, "spell_paths")) 291 else if (!strcmp (buf, "spell_paths"))
249 send_spell_paths (ns, params); 292 send_spell_paths (ns, params);
250 else 293 else
251 { 294 {
… …
267ExtiCmd (char *buf, int len, client *ns) 310ExtiCmd (char *buf, int len, client *ns)
268{ 311{
269 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 312 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
270} 313}
271 314
315//-GPL
316
272void 317void
273client::mapinfo_queue_clear () 318client::mapinfo_queue_clear ()
274{ 319{
275 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) 320 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
276 free (*i); 321 free (*i);
… …
283{ 328{
284 char *token = buf; 329 char *token = buf;
285 buf += strlen (buf) + 9; 330 buf += strlen (buf) + 9;
286 331
287 // initial map and its origin 332 // initial map and its origin
288 maptile *map = pl->observe->map; 333 maptile *map = pl->viewpoint->map;
289 int mapx = pl->ns->mapx / 2 - pl->observe->x; 334 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
290 int mapy = pl->ns->mapy / 2 - pl->observe->y; 335 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
291 int max_distance = 8; // limit maximum path length to something generous 336 int max_distance = 8; // limit maximum path length to something generous
292 337
293 while (*buf && map && max_distance) 338 while (*buf && map && max_distance)
294 { 339 {
295 int dir = *buf++ - '1'; 340 int dir = *buf++ - '1';
… …
400AddMeCmd (char *buf, int len, client *ns) 445AddMeCmd (char *buf, int len, client *ns)
401{ 446{
402 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 447 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
403} 448}
404 449
450//+GPL
451
405/* 452/*
406#define MSG_TYPE_BOOK 1 453#define MSG_TYPE_BOOK 1
407#define MSG_TYPE_CARD 2 454#define MSG_TYPE_CARD 2
408#define MSG_TYPE_PAPER 3 455#define MSG_TYPE_PAPER 3
409#define MSG_TYPE_SIGN 4 456#define MSG_TYPE_SIGN 4
… …
425 while (1) 472 while (1)
426 { 473 {
427 /* 1. Extract an info */ 474 /* 1. Extract an info */
428 info = nextinfo; 475 info = nextinfo;
429 476
430 while ((info < len) && (buf[info] == ' ')) 477 while ((info < len) && (buf [info] == ' '))
431 info++; 478 info++;
432 479
433 if (info >= len) 480 if (info >= len)
434 break; 481 break;
435 482
436 nextinfo = info + 1; 483 nextinfo = info + 1;
437 484
438 while ((nextinfo < len) && (buf[nextinfo] != ' ')) 485 while ((nextinfo < len) && (buf [nextinfo] != ' '))
439 nextinfo++; 486 nextinfo++;
440 487
441 if (nextinfo - info >= 49) /*Erroneous info asked */ 488 if (nextinfo - info >= 49) /*Erroneous info asked */
442 continue; 489 continue;
443 490
444 strncpy (command, &(buf[info]), nextinfo - info); 491 memcpy (command, buf + info, nextinfo - info);
445 command[nextinfo - info] = '\0'; 492 command [nextinfo - info] = 0;
493
446 /* 2. Interpret info */ 494 /* 2. Interpret info */
447 i = sscanf (command, "%d", &flag); 495 i = sscanf (command, "%d", &flag);
448 496
449 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST)) 497 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
450 ns->supported_readables |= (1 << flag); 498 ns->supported_readables |= (1 << flag);
… …
484 return; 532 return;
485 533
486 buf++; 534 buf++;
487 } 535 }
488 536
489 execute_newserver_command (pl->ob, (char *) buf); 537 execute_newserver_command (pl->ob, (char *)buf);
490 538
491 /* Perhaps something better should be done with a left over count. 539 /* Perhaps something better should be done with a left over count.
492 * Cleaning up the input should probably be done first - all actions 540 * Cleaning up the input should probably be done first - all actions
493 * for the command that issued the count should be done before any other 541 * for the command that issued the count should be done before any other
494 * commands. 542 * commands.
… …
528 * commands. 576 * commands.
529 */ 577 */
530 pl->count = 0; 578 pl->count = 0;
531 579
532 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 580 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
533 int time = fabs (pl->ob->speed) < 0.001 581 int time = pl->ob->has_active_speed ()
534 ? time = MAX_TIME * 100
535 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 582 ? (int) (MAX_TIME / fabs (pl->ob->speed))
583 : MAX_TIME * 100;
536 584
537 /* Send confirmation of command execution now */ 585 /* Send confirmation of command execution now */
538 packet sl ("comc"); 586 packet sl ("comc");
539 sl << uint16 (cmdid) << uint32 (time); 587 sl << uint16 (cmdid) << uint32 (time);
540 pl->ns->send_packet (sl); 588 pl->ns->send_packet (sl);
… …
790 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
791 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 839 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
792 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 840 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
793 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 841 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
794 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 842 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
795 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK); 843 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
796 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
797 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); 845 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
798 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 846 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
799 847
800 flags = 0; 848 flags = 0;
801 849
802 if (opl->fire_on) 850 if (opl->fire_on)
… …
927 975
928 /* Nothing changed */ 976 /* Nothing changed */
929 return 0; 977 return 0;
930} 978}
931 979
980//-GPL
981
932// prefetch (and touch) all maps within a specific distancd 982// prefetch (and touch) all maps within a specific distancd
933static void 983static void
934prefetch_surrounding_maps (maptile *map, int distance) 984prefetch_surrounding_maps (maptile *map, int distance)
935{ 985{
936 map->touch (); 986 map->touch ();
… …
949prefetch_surrounding_maps (object *op) 999prefetch_surrounding_maps (object *op)
950{ 1000{
951 prefetch_surrounding_maps (op->map, 3); 1001 prefetch_surrounding_maps (op->map, 3);
952} 1002}
953 1003
1004//+GPL
1005
954/** 1006/**
955 * Draws client map. 1007 * Draws client map.
956 */ 1008 */
957void 1009void
958draw_client_map (player *pl) 1010draw_client_map (player *pl)
959{ 1011{
960 object *ob = pl->observe; 1012 object *ob = pl->viewpoint;
961 if (!ob->active) 1013 if (!pl->observe->active)
962 return; 1014 return;
963 1015
964 /* 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
965 * 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
966 * be OK once they really log in. 1018 * be OK once they really log in.
… …
973 check_map_change (pl); 1025 check_map_change (pl);
974 prefetch_surrounding_maps (pl->ob); 1026 prefetch_surrounding_maps (pl->ob);
975 1027
976 /* do LOS after calls to update_position */ 1028 /* do LOS after calls to update_position */
977 /* unfortunately, we need to udpate los when observing, currently */ 1029 /* unfortunately, we need to udpate los when observing, currently */
978 if (pl->do_los || pl->observe != pl->ob) 1030 if (pl->do_los || pl->viewpoint != pl->ob)
979 { 1031 {
980 pl->do_los = 0; 1032 pl->do_los = 0;
981 pl->update_los (); 1033 pl->update_los ();
982 } 1034 }
983 1035
… …
1214 socket.send_packet (sl); 1266 socket.send_packet (sl);
1215 socket.sent_scroll = 0; 1267 socket.sent_scroll = 0;
1216 } 1268 }
1217} 1269}
1218 1270
1219/*****************************************************************************/
1220/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1221/* a player. Of course, the client need to know the command to be able to */
1222/* manage it ! */
1223/*****************************************************************************/
1224void
1225send_plugin_custom_message (object *pl, char *buf)
1226{
1227 pl->contr->ns->send_packet (buf);
1228}
1229
1230/**
1231 * This sends the skill number to name mapping. We ignore
1232 * the params - we always send the same info no matter what.
1233 */
1234void
1235send_skill_info (client *ns, char *params)
1236{
1237 packet sl;
1238 sl << "replyinfo skill_info\n";
1239
1240 for (int i = 1; i < NUM_SKILLS; i++)
1241 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1242
1243 if (sl.length () > MAXSOCKBUF)
1244 {
1245 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1246 fatal (0);
1247 }
1248
1249 ns->send_packet (sl);
1250}
1251
1252/**
1253 * This sends the spell path to name mapping. We ignore
1254 * the params - we always send the same info no matter what.
1255 */
1256void
1257send_spell_paths (client * ns, char *params)
1258{
1259 packet sl;
1260
1261 sl << "replyinfo spell_paths\n";
1262
1263 for (int i = 0; i < NRSPELLPATHS; i++)
1264 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1265
1266 if (sl.length () > MAXSOCKBUF)
1267 {
1268 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1269 fatal (0);
1270 }
1271
1272 ns->send_packet (sl);
1273}
1274
1275/** 1271/**
1276 * This looks for any spells the player may have that have changed their stats. 1272 * This looks for any spells the player may have that have changed their stats.
1277 * it then sends an updspell packet for each spell that has changed in this way 1273 * it then sends an updspell packet for each spell that has changed in this way
1278 */ 1274 */
1279void 1275void
… …
1459 /* finally, we can send the packet */ 1455 /* finally, we can send the packet */
1460 pl->ns->flush_fx (); 1456 pl->ns->flush_fx ();
1461 pl->ns->send_packet (sl); 1457 pl->ns->send_packet (sl);
1462} 1458}
1463 1459
1460//-GPL
1461

Diff Legend

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