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

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.85 by root, Sun Nov 29 09:41:28 2009 UTC vs.
Revision 1.89 by root, Sat Apr 3 02:27:24 2010 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 (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * 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 9 * 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 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
619 { 619 {
620 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag); 620 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);
621 return; 621 return;
622 } 622 }
623 623
624 player_apply (pl->ob, op, 0, 0); 624 pl->ob->apply (op);
625} 625}
626 626
627/** Client wants to lock some object. Lets do so. */ 627/** Client wants to lock some object. Lets do so. */
628void 628void
629LockItem (char *data, int len, player *pl) 629LockItem (char *data, int len, player *pl)
714 { 714 {
715 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) 715 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
716 continue; 716 continue;
717 717
718 if (wiz) 718 if (wiz)
719 buf.printf (" - %s (%d).\n", query_name (tmp), tmp->count); 719 buf.printf (" - %s (%d) %s\n", query_name (tmp), tmp->count, tmp->uuid.c_str ());
720 else 720 else
721 buf.printf (" - %s.\n", query_name (tmp)); 721 buf.printf (" - %s.\n", query_name (tmp));
722 722
723 object *head = tmp->head_ (); 723 object *head = tmp->head_ ();
724 724

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines