ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/c_object.C
(Generate patch)

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.31 by root, Fri Dec 22 16:34:00 2006 UTC vs.
Revision 1.41 by root, Sun Mar 18 03:05:40 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
23 *
24 */
22 25
26/*
23 Object (handling) commands 27 * Object (handling) commands
24*/ 28 */
25 29
26#include <global.h> 30#include <global.h>
27#include <loader.h> 31#include <loader.h>
28#include <skills.h> 32#include <skills.h>
29#ifndef __CEXTRACT__
30# include <sproto.h> 33#include <sproto.h>
31#endif
32#include <living.h> 34#include <living.h>
33#include <math.h> 35#include <math.h>
34 36
35/* 37/*
36 * Object id parsing functions 38 * Object id parsing functions
… …
273 if (QUERY_FLAG (tmp, FLAG_WAS_WIZ) && !QUERY_FLAG (pl, FLAG_WAS_WIZ)) 275 if (QUERY_FLAG (tmp, FLAG_WAS_WIZ) && !QUERY_FLAG (pl, FLAG_WAS_WIZ))
274 { 276 {
275 new_draw_info (NDI_UNIQUE, 0, pl, "The object disappears in a puff of smoke!"); 277 new_draw_info (NDI_UNIQUE, 0, pl, "The object disappears in a puff of smoke!");
276 new_draw_info (NDI_UNIQUE, 0, pl, "It must have been an illusion."); 278 new_draw_info (NDI_UNIQUE, 0, pl, "It must have been an illusion.");
277 279
278 if (pl->type == PLAYER) 280 if (pl->contr)
279 esrv_del_item (pl->contr, tmp->count); 281 esrv_del_item (pl->contr, tmp->count);
280 282
281 tmp->destroy (); 283 tmp->destroy ();
282 return; 284 return;
283 } 285 }
… …
299 { 301 {
300 new_draw_info (0, 0, pl, "That item is too heavy for you to pick up."); 302 new_draw_info (0, 0, pl, "That item is too heavy for you to pick up.");
301 return; 303 return;
302 } 304 }
303 305
304 if (settings.real_wiz == FALSE && QUERY_FLAG (pl, FLAG_WAS_WIZ))
305 SET_FLAG (tmp, FLAG_WAS_WIZ);
306
307 if (nrof != tmp_nrof) 306 if (nrof != tmp_nrof)
308 { 307 {
309 object *tmp2 = tmp; 308 object *tmp2 = tmp;
310 309
311 tmp = get_split_ob (tmp, nrof); 310 tmp = get_split_ob (tmp, nrof);
… …
313 { 312 {
314 new_draw_info (NDI_UNIQUE, 0, pl, errmsg); 313 new_draw_info (NDI_UNIQUE, 0, pl, errmsg);
315 return; 314 return;
316 } 315 }
317 316
318 /* Tell a client what happened rest of objects */ 317 /* Tell the client what happened to the rest of objects */
319 if (pl->type == PLAYER) 318 if (pl->contr)
320 {
321 if (tmp2->destroyed ()) 319 if (tmp2->destroyed ())
322 esrv_del_item (pl->contr, tmp2->count); 320 esrv_del_item (pl->contr, tmp2->count);
323 else 321 else
324 esrv_send_item (pl, tmp2); 322 esrv_update_item (UPD_NROF, pl, tmp2);
325 }
326 } 323 }
327 else 324 else
328 { 325 {
329 /* If the object is in a container, send a delete to the client. 326 /* If the object is in a container, send a delete to the client.
330 * - we are moving all the items from the container to elsewhere, 327 * - we are moving all the items from the container to elsewhere,
… …
332 */ 329 */
333 if (!QUERY_FLAG (tmp, FLAG_REMOVED)) 330 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
334 { 331 {
335 if (tmp->env && pl->type == PLAYER) 332 if (tmp->env && pl->type == PLAYER)
336 esrv_del_item (pl->contr, tmp->count); 333 esrv_del_item (pl->contr, tmp->count);
334
337 tmp->remove (); /* Unlink it */ 335 tmp->remove (); /* Unlink it */
338 } 336 }
339 } 337 }
338
340 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 339 if (QUERY_FLAG (tmp, FLAG_UNPAID))
341 (void) sprintf (buf, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP)); 340 sprintf (buf, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP));
342 else 341 else
343 (void) sprintf (buf, "You pick up the %s.", query_name (tmp)); 342 sprintf (buf, "You pick up the %s.", query_name (tmp));
343
344 new_draw_info (NDI_UNIQUE, 0, pl, buf); 344 new_draw_info (NDI_UNIQUE, 0, pl, buf);
345 345
346 tmp = insert_ob_in_ob (tmp, op); 346 tmp = insert_ob_in_ob (tmp, op);
347 347
348 /* All the stuff below deals with client/server code, and is only 348 /* All the stuff below deals with client/server code, and is only
349 * usable by players 349 * usable by players
350 */ 350 */
351 if (pl->type != PLAYER) 351 if (pl->contr)
352 return; 352 {
353
354 esrv_send_item (pl, tmp); 353 esrv_send_item (pl, tmp);
354
355 /* These are needed to update the weight for the container we 355 /* These are needed to update the weight for the container we
356 * are putting the object in. 356 * are putting the object in.
357 */ 357 */
358 if (op != pl) 358 if (op != pl)
359 { 359 {
360 esrv_update_item (UPD_WEIGHT, pl, op); 360 esrv_update_item (UPD_WEIGHT, pl, op);
361 esrv_send_item (pl, pl); 361 esrv_send_item (pl, pl);
362 } 362 }
363 363
364 /* Update the container the object was in */ 364 /* Update the container the object was in */
365 if (env && env != pl && env != op) 365 if (env && env != pl && env != op)
366 esrv_update_item (UPD_WEIGHT, pl, env); 366 esrv_update_item (UPD_WEIGHT, pl, env);
367 }
367} 368}
368 369
369/* modified slightly to allow monsters use this -b.t. 5-31-95 */ 370/* modified slightly to allow monsters use this -b.t. 5-31-95 */
370void 371void
371pick_up (object *op, object *alt) 372pick_up (object *op, object *alt)
… …
430 431
431 if (!alt) 432 if (!alt)
432 for (alt = op->inv; alt; alt = alt->below) 433 for (alt = op->inv; alt; alt = alt->below)
433 if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) && sack_can_hold (NULL, alt, tmp, count)) 434 if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) && sack_can_hold (NULL, alt, tmp, count))
434 break; /* General container comes next */ 435 break; /* General container comes next */
436
435 if (!alt) 437 if (!alt)
436 alt = op; /* No free containers */ 438 alt = op; /* No free containers */
437 } 439 }
438 440
439 if (tmp->env == alt) 441 if (tmp->env == alt)
… …
466 468
467leave: 469leave:
468 if (need_fix_tmp) 470 if (need_fix_tmp)
469 fix_stopped_item (tmp, tmp_map, op); 471 fix_stopped_item (tmp, tmp_map, op);
470} 472}
471
472 473
473/* This takes (picks up) and item. op is the player 474/* This takes (picks up) and item. op is the player
474 * who issued the command. params is a string to 475 * who issued the command. params is a string to
475 * match against the item name. Basically, always 476 * match against the item name. Basically, always
476 * returns zero, but that should be improved. 477 * returns zero, but that should be improved.
… …
491 492
492 if (!tmp) 493 if (!tmp)
493 tmp = op->below; 494 tmp = op->below;
494 } 495 }
495 496
496 if (tmp == NULL) 497 if (!tmp)
497 { 498 {
498 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to take!"); 499 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to take!");
499 return 0; 500 return 0;
500 } 501 }
501 502
502 /* Makes processing easier */ 503 /* Makes processing easier */
503 if (params && *params == '\0') 504 if (params && *params == '\0')
504 params = NULL; 505 params = 0;
505 506
506 while (tmp) 507 while (tmp)
507 { 508 {
508 next = tmp->below; 509 next = tmp->below;
509 510
510 if (tmp->invisible) 511 if (tmp->invisible)
511 { 512 {
512 tmp = next; 513 tmp = next;
513 continue; 514 continue;
514 } 515 }
516
515 /* This following two if and else if could be merged into line 517 /* This following two if and else if could be merged into line
516 * but that probably will make it more difficult to read, and 518 * but that probably will make it more difficult to read, and
517 * not make it any more efficient 519 * not make it any more efficient
518 */ 520 */
519 if (params && item_matched_string (op, tmp, params)) 521 if (params && item_matched_string (op, tmp, params))
520 {
521 pick_up (op, tmp); 522 pick_up (op, tmp);
522 }
523 else if (can_pick (op, tmp) && !params) 523 else if (can_pick (op, tmp) && !params)
524 { 524 {
525 pick_up (op, tmp); 525 pick_up (op, tmp);
526 break; 526 break;
527 } 527 }
528
528 tmp = next; 529 tmp = next;
529 /* Might as well just skip over the player immediately -
530 * we know it can't be picked up
531 */
532 if (tmp == op)
533 tmp = tmp->below;
534 } 530 }
531
535 if (!params && !tmp) 532 if (!params && !tmp)
536 { 533 {
537 for (tmp = op->below; tmp != NULL; tmp = tmp->next) 534 for (tmp = op->below; tmp; tmp = tmp->below)
538 if (!tmp->invisible) 535 if (!tmp->invisible)
539 { 536 {
540 char buf[MAX_BUF]; 537 char buf[MAX_BUF];
541 538
542 sprintf (buf, "You can't pick up a %s.", &tmp->name); 539 sprintf (buf, "You can't pick up a %s.", &tmp->name);
543 new_draw_info (NDI_UNIQUE, 0, op, buf); 540 new_draw_info (NDI_UNIQUE, 0, op, buf);
544 break; 541 break;
545 } 542 }
543
546 if (!tmp) 544 if (!tmp)
547 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up."); 545 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up.");
548 } 546 }
547
549 return 0; 548 return 0;
550} 549}
551 550
552 551
553/* 552/*
… …
667 666
668 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 667 if (QUERY_FLAG (tmp, FLAG_APPLIED))
669 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 668 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
670 return; /* can't unapply it */ 669 return; /* can't unapply it */
671 670
671 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
672
672 /* We are only dropping some of the items. We split the current object 673 /* We are only dropping some of the items. We split the current object
673 * off 674 * off
674 */ 675 */
675 if (nrof && tmp->nrof != nrof) 676 if (nrof && tmp->nrof != nrof)
676 { 677 {
… …
710 711
711 tmp->destroy (); 712 tmp->destroy ();
712 op->update_stats (); 713 op->update_stats ();
713 return; 714 return;
714 } 715 }
715
716/* If SAVE_INTERVAL is commented out, we never want to save
717 * the player here.
718 */
719#ifdef SAVE_INTERVAL
720 /* I'm not sure why there is a value check - since the save
721 * is done every SAVE_INTERVAL seconds, why care the value
722 * of what he is dropping?
723 */
724 if (op->type == PLAYER && !QUERY_FLAG (tmp, FLAG_UNPAID) &&
725 (tmp->nrof ? tmp->value * tmp->nrof : tmp->value > 2000) && (op->contr->last_save_time + SAVE_INTERVAL) <= time (NULL))
726 {
727 op->contr->save ();
728 op->contr->last_save_time = time (NULL);
729 }
730#endif /* SAVE_INTERVAL */
731 716
732 if (op->type == PLAYER) 717 if (op->type == PLAYER)
733 esrv_del_item (op->contr, tmp->count); 718 esrv_del_item (op->contr, tmp->count);
734 719
735 /* Call this before we update the various windows/players. At least 720 /* Call this before we update the various windows/players. At least
… …
994{ 979{
995 if (!params) 980 if (!params)
996 { 981 {
997 object *tmp = op->below; 982 object *tmp = op->below;
998 983
999 while (tmp && !LOOK_OBJ (tmp)) 984 while (tmp && !tmp->client_visible ())
1000 tmp = tmp->below; 985 tmp = tmp->below;
1001 if (tmp) 986 if (tmp)
1002 examine (op, tmp); 987 examine (op, tmp);
1003 } 988 }
1004 else 989 else
… …
1055 } 1040 }
1056 } 1041 }
1057 1042
1058 return 0; 1043 return 0;
1059} 1044}
1060
1061
1062/* op should be a player, params is any params.
1063 * If no params given, we print out the currently marked object.
1064 * otherwise, try to find a matching object - try best match first.
1065 */
1066int
1067command_mark (object *op, char *params)
1068{
1069 if (!op->contr)
1070 return 1;
1071
1072 if (!params)
1073 {
1074 object *mark = find_marked_object (op);
1075
1076 if (!mark)
1077 new_draw_info (NDI_UNIQUE, 0, op, "You have no marked object.");
1078 else
1079 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is marked.", query_name (mark));
1080 }
1081 else
1082 {
1083 object *mark1 = find_best_object_match (op, params);
1084
1085 if (!mark1)
1086 {
1087 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find an object that matches %s", params);
1088 return 1;
1089 }
1090 else
1091 {
1092 op->contr->mark = mark1;
1093 new_draw_info_format (NDI_UNIQUE, 0, op, "Marked item %s", query_name (mark1));
1094 return 0;
1095 }
1096 }
1097
1098 return 0; /*shouldnt get here */
1099}
1100
1101 1045
1102/* op is the player 1046/* op is the player
1103 * tmp is the monster being examined. 1047 * tmp is the monster being examined.
1104 */ 1048 */
1105void 1049void
… …
1138 } 1082 }
1139 if (present_in_ob (POISONING, mon) != NULL) 1083 if (present_in_ob (POISONING, mon) != NULL)
1140 new_draw_info (NDI_UNIQUE, 0, op, "It looks very ill."); 1084 new_draw_info (NDI_UNIQUE, 0, op, "It looks very ill.");
1141} 1085}
1142 1086
1143
1144/* tmp is the object being described, pl is who is examing it. */ 1087/* tmp is the object being described, pl is who is examing it. */
1145char * 1088const char *
1146long_desc (object *tmp, object *pl) 1089long_desc (object *tmp, object *pl)
1147{ 1090{
1148 static char buf[VERY_BIG_BUF]; 1091 static char buf[VERY_BIG_BUF];
1149 char *cp; 1092 const char *cp;
1150 1093
1151 if (tmp == NULL) 1094 if (tmp == NULL)
1152 return ""; 1095 return "";
1153 1096
1154 buf[0] = '\0'; 1097 buf[0] = '\0';
… …
1171 case FOOD: 1114 case FOOD:
1172 case DRINK: 1115 case DRINK:
1173 case FLESH: 1116 case FLESH:
1174 case SKILL_TOOL: 1117 case SKILL_TOOL:
1175 case POWER_CRYSTAL: 1118 case POWER_CRYSTAL:
1176 if (*(cp = describe_item (tmp, pl)) != '\0') 1119 if (*(cp = describe_item (tmp, pl)))
1177 { 1120 {
1178 int len; 1121 int len;
1179 1122
1180 assign (buf, query_name (tmp)); 1123 assign (buf, query_name (tmp));
1181 len = strlen (buf); 1124 len = strlen (buf);
… …
1332 */ 1275 */
1333void 1276void
1334inventory (object *op, object *inv) 1277inventory (object *op, object *inv)
1335{ 1278{
1336 object *tmp; 1279 object *tmp;
1337 char *in; 1280 const char *in;
1338 int items = 0, length; 1281 int items = 0, length;
1339 1282
1340 if (inv == NULL && op == NULL) 1283 if (inv == NULL && op == NULL)
1341 { 1284 {
1342 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object?"); 1285 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object?");
1343 return; 1286 return;
1344 } 1287 }
1288
1345 tmp = inv ? inv->inv : op->inv; 1289 tmp = inv ? inv->inv : op->inv;
1346 1290
1347 while (tmp) 1291 while (tmp)
1348 { 1292 {
1349 if ((!tmp->invisible && 1293 if ((!tmp->invisible &&
1350 (inv == NULL || inv->type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) || (!op || QUERY_FLAG (op, FLAG_WIZ))) 1294 (inv == NULL || inv->type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) || (!op || QUERY_FLAG (op, FLAG_WIZ)))
1351 items++; 1295 items++;
1352 tmp = tmp->below; 1296 tmp = tmp->below;
1353 } 1297 }
1298
1354 if (inv == NULL) 1299 if (inv == NULL)
1355 { /* player's inventory */ 1300 { /* player's inventory */
1356 if (items == 0) 1301 if (items == 0)
1357 { 1302 {
1358 new_draw_info (NDI_UNIQUE, 0, op, "You carry nothing."); 1303 new_draw_info (NDI_UNIQUE, 0, op, "You carry nothing.");
… …
1375 { 1320 {
1376 length = 28; 1321 length = 28;
1377 in = " "; 1322 in = " ";
1378 } 1323 }
1379 } 1324 }
1325
1380 for (tmp = inv ? inv->inv : op->inv; tmp; tmp = tmp->below) 1326 for (tmp = inv ? inv->inv : op->inv; tmp; tmp = tmp->below)
1381 { 1327 {
1382 if ((!op || !QUERY_FLAG (op, FLAG_WIZ)) && (tmp->invisible || (inv && inv->type != CONTAINER && !QUERY_FLAG (tmp, FLAG_APPLIED)))) 1328 if ((!op || !QUERY_FLAG (op, FLAG_WIZ)) && (tmp->invisible || (inv && inv->type != CONTAINER && !QUERY_FLAG (tmp, FLAG_APPLIED))))
1383 continue; 1329 continue;
1384 if ((!op || QUERY_FLAG (op, FLAG_WIZ))) 1330 if ((!op || QUERY_FLAG (op, FLAG_WIZ)))
1385 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s (%5d) %-8s", in, length, length, 1331 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s (%5d) %-8s", in, length, length,
1386 query_name (tmp), tmp->count, query_weight (tmp)); 1332 query_name (tmp), tmp->count, query_weight (tmp));
1387 else 1333 else
1388 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s %-8s", in, length + 8, length + 8, query_name (tmp), query_weight (tmp)); 1334 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s %-8s", in, length + 8, length + 8, query_name (tmp), query_weight (tmp));
1389 } 1335 }
1336
1390 if (!inv && op) 1337 if (!inv && op)
1391 {
1392 new_draw_info_format (NDI_UNIQUE, 0, op, "%-*s %-8s", 41, "Total weight :", query_weight (op)); 1338 new_draw_info_format (NDI_UNIQUE, 0, op, "%-*s %-8s", 41, "Total weight :", query_weight (op));
1393 }
1394} 1339}
1395 1340
1396static void 1341static void
1397display_new_pickup (object *op) 1342display_new_pickup (object *op)
1398{ 1343{

Diff Legend

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