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.122 by root, Thu Apr 15 00:36:51 2010 UTC vs.
Revision 1.134 by root, Sat Nov 17 23:40:03 2018 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 9 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 10 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 17 * GNU General Public License for more details.
17 * 18 *
18 * You should have received a copy of the Affero GNU General Public License 19 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 20 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 21 * <http://www.gnu.org/licenses/>.
21 * 22 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 23 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 24 */
24 25
25/* 26/*
26 * Object (handling) commands 27 * Object (handling) commands
… …
233 { 234 {
234 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack)); 235 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack));
235 return 0; 236 return 0;
236 } 237 }
237 238
238 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) * 239 if (sack->weight_limit
240 && weight_t (sack->carrying
241 + sack->number_of ()
239 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0)) 242 * (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0))
240 * (100 - sack->stats.Str) / 100) > sack->weight_limit) 243 * (100 - sack->stats.Str) / 100)
244 > sack->weight_limit)
241 { 245 {
242 new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack)); 246 new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack));
243 return 0; 247 return 0;
244 } 248 }
245 249
… …
248} 252}
249 253
250/* Pick up commands follow */ 254/* Pick up commands follow */
251 255
252/* pl = player (not always - monsters can use this now) 256/* pl = player (not always - monsters can use this now)
253 * op is the object to put tmp into, 257 * op is the object to put tmp into,
254 * tmp is the object to pick up, nrof is the number to 258 * tmp is the object to pick up, nrof is the number to
255 * pick up (0 means all of them) 259 * pick up (0 means all of them)
256 */ 260 */
257static void 261static void
258pick_up_object (object *pl, object *op, object *tmp, int nrof) 262pick_up_object (object *pl, object *op, object *tmp, int nrof)
259{ 263{
260 object *env = tmp->env;
261 uint32 weight, effective_weight_limit; 264 weight_t weight, effective_weight_limit;
262 int tmp_nrof = tmp->number_of (); 265 int tmp_nrof = tmp->number_of ();
263 266
264 /* IF the player is flying & trying to take the item out of a container 267 /* IF the player is flying & trying to take the item out of a container
265 * that is in his inventory, let him. tmp->env points to the container 268 * that is in his inventory, let him. tmp->env points to the container
266 * (sack, luggage, etc), tmp->env->env then points to the player (nested 269 * (sack, luggage, etc), tmp->env->env then points to the player (nested
267 * containers not allowed as of now) 270 * containers not allowed as of now)
268 */ 271 */
269 if ((pl->move_type & MOVE_FLYING) && !pl->flag [FLAG_WIZ] && tmp->in_player () != pl) 272 if ((pl->move_type & MOVE_FLYING) && !pl->flag [FLAG_WIZ] && tmp->in_player () != pl)
270 { 273 {
271 pl->failmsg ("You are levitating, you can't reach the ground! " 274 pl->failmsg ("You are levitating, you can't reach the ground! "
… …
501 504
502 return 0; 505 return 0;
503} 506}
504 507
505/* 508/*
506 * This function was part of drop, now is own function. 509 * This function was part of drop, now is own function.
507 * Player 'op' tries to put object 'tmp' into sack 'sack', 510 * Player 'op' tries to put object 'tmp' into sack 'sack',
508 * if nrof is non zero, then nrof objects is tried to put into sack. 511 * if nrof is non zero, then nrof objects is tried to put into sack.
509 * 512 *
510 * Note that the 'sack' in question can now be a transport, 513 * Note that the 'sack' in question can now be a transport,
511 * so this function isn't named very good anymore. 514 * so this function isn't named very good anymore.
512 */ 515 */
513void 516void
514put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof) 517put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof)
515{ 518{
516 object *tmp2, *sack2; 519 object *tmp2;
517 char buf[MAX_BUF]; 520 char buf[MAX_BUF];
518 521
519 if (sack == tmp) 522 if (sack == tmp)
520 return; /* Can't put an object in itself */ 523 return; /* Can't put an object in itself */
521 524
… …
529 { 532 {
530 /* Eneq(@csd.uu.se): If the object to be dropped is a container 533 /* Eneq(@csd.uu.se): If the object to be dropped is a container
531 * we instead move the contents of that container into the active 534 * we instead move the contents of that container into the active
532 * container, this is only done if the object has something in it. 535 * container, this is only done if the object has something in it.
533 */ 536 */
534 sack2 = tmp;
535 new_draw_info_format (NDI_UNIQUE, 0, op, "You move the items from %s into %s.", query_name (tmp), query_name (sack)); 537 new_draw_info_format (NDI_UNIQUE, 0, op, "You move the items from %s into %s.", query_name (tmp), query_name (sack));
536 538
537 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 539 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
538 { 540 {
539 tmp = tmp2->below; 541 tmp = tmp2->below;
… …
607 if (obj->destroyed () || obj->is_inserted ()) 609 if (obj->destroyed () || obj->is_inserted ())
608 return; 610 return;
609 611
610 if (dropper->is_in_shop () && !obj->flag [FLAG_UNPAID] && obj->type != MONEY) 612 if (dropper->is_in_shop () && !obj->flag [FLAG_UNPAID] && obj->type != MONEY)
611 if (!sell_item (obj, dropper)) 613 if (!sell_item (obj, dropper))
612 return; 614 return;
613 615
614 if (!obj->can_drop_at (dropper->map, dropper->x, dropper->y, dropper)) 616 if (!obj->can_drop_at (dropper->map, dropper->x, dropper->y, dropper))
615 return; 617 return;
616 618
617 /* If nothing special happened with this object, the default action is to 619 /* If nothing special happened with this object, the default action is to
… …
736 } 738 }
737 739
738 object *curinv = op->inv; 740 object *curinv = op->inv;
739 object *nextinv; 741 object *nextinv;
740 742
741 /* 743 /*
742 This is the default. Drops everything not locked or considered 744 This is the default. Drops everything not locked or considered
743 not something that should be dropped. 745 not something that should be dropped.
744 */ 746 */
745 /* 747 /*
746 Care must be taken that the next item pointer is not to money as 748 Care must be taken that the next item pointer is not to money as
… …
757 759
758 while (nextinv && nextinv->type == MONEY) 760 while (nextinv && nextinv->type == MONEY)
759 nextinv = nextinv->below; 761 nextinv = nextinv->below;
760 762
761 if (!curinv->flag [FLAG_INV_LOCKED] 763 if (!curinv->flag [FLAG_INV_LOCKED]
764 && !curinv->invisible
762 && curinv->type != MONEY 765 && curinv->type != MONEY
763 && curinv->type != FOOD 766 && curinv->type != FOOD
764 && curinv->type != KEY 767 && curinv->type != KEY
765 && curinv->type != SPECIAL_KEY 768 && curinv->type != SPECIAL_KEY
766 && curinv->type != GEM 769 && curinv->type != GEM
767 && !curinv->invisible 770 && curinv->type != CONTAINER)
768 && (curinv->type != CONTAINER || op->container_ () != curinv))
769 { 771 {
770 drop (op, curinv); 772 drop (op, curinv);
771 if (--cnt <= 0) break; 773 if (--cnt <= 0) break;
772 } 774 }
773 775
… …
891 */ 893 */
892int 894int
893command_drop (object *op, char *params) 895command_drop (object *op, char *params)
894{ 896{
895 object *tmp, *next; 897 object *tmp, *next;
896 int did_one = 0;
897 898
898 if (!params) 899 if (!params)
899 { 900 {
900 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?"); 901 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
901 return 0; 902 return 0;
… …
1024 case SHIELD: 1025 case SHIELD:
1025 case BOOTS: 1026 case BOOTS:
1026 case GLOVES: 1027 case GLOVES:
1027 case AMULET: 1028 case AMULET:
1028 case GIRDLE: 1029 case GIRDLE:
1030 case RANGED:
1029 case BOW: 1031 case BOW:
1030 case ARROW: 1032 case ARROW:
1031 case CLOAK: 1033 case CLOAK:
1032 case FOOD: 1034 case FOOD:
1033 case DRINK: 1035 case DRINK:

Diff Legend

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