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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.243 by root, Sat Nov 7 18:30:06 2009 UTC vs.
Revision 1.245 by root, Tue Nov 10 04:38:46 2009 UTC

867 if (op->move_type & MOVE_FLYING) 867 if (op->move_type & MOVE_FLYING)
868 return 1; 868 return 1;
869 869
870 next = op->below; 870 next = op->below;
871 871
872 int cnt = MAX_ITEM_PER_DROP; 872 int cnt = MAX_ITEM_PER_ACTION;
873#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0) 873#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
874 874
875 /* loop while there are items on the floor that are not marked as 875 /* loop while there are items on the floor that are not marked as
876 * destroyed */ 876 * destroyed */
877 while (next && !next->destroyed ()) 877 while (next && !next->destroyed ())
2481 &op->name, op->contr->title, 2481 &op->name, op->contr->title,
2482 (int)op->level, 2482 (int)op->level,
2483 op->contr->killer_name () 2483 op->contr->killer_name ()
2484 ); 2484 );
2485 tmp->value = 0, tmp->type = 0; 2485 tmp->value = 0, tmp->type = 0;
2486 tmp->materialname = "organics"; 2486 tmp->material = name_to_material (shstr_organic);
2487 tmp->insert_at (op, tmp); 2487 tmp->insert_at (op, tmp);
2488 } 2488 }
2489 2489
2490 /* teleport defeated player to new destination */ 2490 /* teleport defeated player to new destination */
2491 transfer_ob (op, x, y, 0, NULL); 2491 transfer_ob (op, x, y, 0, NULL);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines