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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.146 by root, Mon Apr 21 07:07:36 2008 UTC vs.
Revision 1.147 by root, Tue Apr 22 02:46:18 2008 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * 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
2754 tmp2->stats.food = op->stats.food; 2754 tmp2->stats.food = op->stats.food;
2755 CLEAR_FLAG (tmp2, FLAG_APPLIED); 2755 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2756 2756
2757 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 2757 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2758 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2758 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2759
2760 if (who->contr)
2761 esrv_del_item (who->contr, op->count);
2762 2759
2763 op->destroy (); 2760 op->destroy ();
2764 insert_ob_in_ob (tmp2, who); 2761 insert_ob_in_ob (tmp2, who);
2765 who->update_stats (); 2762 who->update_stats ();
2766 2763
3306 SET_FLAG (tmp2, FLAG_INV_LOCKED); 3303 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3307 3304
3308 insert_ob_in_ob (tmp2, who); 3305 insert_ob_in_ob (tmp2, who);
3309 3306
3310 /* Remove the old lantern */ 3307 /* Remove the old lantern */
3311 if (who->type == PLAYER)
3312 esrv_del_item (who->contr, op->count);
3313
3314 op->destroy (); 3308 op->destroy ();
3315 3309
3316 /* insert the portion that was split off */ 3310 /* insert the portion that was split off */
3317 if (tmp) 3311 if (tmp)
3318 { 3312 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines