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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.18 by root, Thu Sep 14 21:16:11 2006 UTC vs.
Revision 1.22 by root, Sun Dec 10 20:15:57 2006 UTC

1
2/*
3 * static char *rcs_treasure_c =
4 * "$Id: treasure.C,v 1.18 2006/09/14 21:16:11 root Exp $";
5 */
6
7/* 1/*
8 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
9 3
10 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
11 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
22 16
23 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
24 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26 20
27 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
28*/ 22*/
29 23
30#define ALLOWED_COMBINATION 24#define ALLOWED_COMBINATION
31 25
32/* TREASURE_DEBUG does some checking on the treasurelists after loading. 26/* TREASURE_DEBUG does some checking on the treasurelists after loading.
464 458
465 /* Don't want to free the object we are about to return */ 459 /* Don't want to free the object we are about to return */
466 tmp = ob->inv; 460 tmp = ob->inv;
467 if (tmp != NULL) 461 if (tmp != NULL)
468 remove_ob (tmp); 462 remove_ob (tmp);
463
469 if (ob->inv) 464 if (ob->inv)
470 {
471 LOG (llevError, "In generate treasure, created multiple objects.\n"); 465 LOG (llevError, "In generate treasure, created multiple objects.\n");
472 } 466
473 free_object (ob); 467 free_object (ob);
474 return tmp; 468 return tmp;
475} 469}
476 470
477/* 471/*
855 } 849 }
856 850
857 if (difficulty < 1) 851 if (difficulty < 1)
858 difficulty = 1; 852 difficulty = 1;
859 853
854 if (INVOKE_OBJECT (ADD_BONUS, op,
855 ARG_OBJECT (creator != op ? creator : 0),
856 ARG_INT (difficulty), ARG_INT (max_magic),
857 ARG_INT (flags)))
858 return;
859
860 if (!(flags & GT_MINIMAL)) 860 if (!(flags & GT_MINIMAL))
861 { 861 {
862 if (op->arch == crown_arch) 862 if (op->arch == crown_arch)
863 { 863 {
864 set_magic (difficulty, op, max_magic, flags); 864 set_magic (difficulty, op, max_magic, flags);
1562 op->gen_sp_armour = (op->gen_sp_armour * (change->gen_sp_armour)) / 100; 1562 op->gen_sp_armour = (op->gen_sp_armour * (change->gen_sp_armour)) / 100;
1563 1563
1564 op->item_power = change->item_power; 1564 op->item_power = change->item_power;
1565 1565
1566 for (i = 0; i < NROFATTACKS; i++) 1566 for (i = 0; i < NROFATTACKS; i++)
1567 {
1568 if (change->resist[i]) 1567 if (change->resist[i])
1569 {
1570 op->resist[i] += change->resist[i]; 1568 op->resist[i] += change->resist[i];
1571 }
1572 }
1573 1569
1574 if (change->stats.dam) 1570 if (change->stats.dam)
1575 { 1571 {
1576 if (change->stats.dam < 0) 1572 if (change->stats.dam < 0)
1577 op->stats.dam = (-change->stats.dam); 1573 op->stats.dam = (-change->stats.dam);
1855 free_artifact (at->next); 1851 free_artifact (at->next);
1856 1852
1857 if (at->allowed) 1853 if (at->allowed)
1858 free_charlinks (at->allowed); 1854 free_charlinks (at->allowed);
1859 1855
1860 at->item->free (1); 1856 at->item->destroy (1);
1861 1857
1862 delete at; 1858 delete at;
1863} 1859}
1864 1860
1865void 1861void
1866free_artifactlist (artifactlist * al) 1862free_artifactlist (artifactlist * al)
1867{ 1863{
1868 artifactlist *nextal; 1864 artifactlist *nextal;
1869 1865
1870 for (al = first_artifactlist; al != NULL; al = nextal) 1866 for (al = first_artifactlist; al; al = nextal)
1871 { 1867 {
1872 nextal = al->next; 1868 nextal = al->next;
1873 1869
1874 if (al->items) 1870 if (al->items)
1875 free_artifact (al->items); 1871 free_artifact (al->items);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines