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

Comparing deliantra/server/server/resurrection.C (file contents):
Revision 1.19 by pippijn, Mon Jan 15 21:06:20 2007 UTC vs.
Revision 1.22 by root, Mon Jun 4 12:19:09 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
9 * it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
10 * the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 * (at your option) any later version. 11 * any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful, but
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 * GNU General Public License for more details. 16 * for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License along
19 * along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 23 */
24 24
25/* the contents of this file were create solely by peterm@soda.berkeley.edu 25/* the contents of this file were create solely by peterm@soda.berkeley.edu
26 all of the above disclaimers apply. */ 26 all of the above disclaimers apply. */
27 27
48 int Con; 48 int Con;
49 49
50 /* reincarnation, which changes the race */ 50 /* reincarnation, which changes the race */
51 if (spell->race) 51 if (spell->race)
52 { 52 {
53 treasurelist *tl = find_treasurelist (spell->race); 53 treasurelist *tl = treasurelist::find (spell->race);
54 treasure *t; 54 treasure *t;
55 int value; 55 int value;
56 56
57 if (!tl) 57 if (!tl)
58 { 58 {
59 LOG (llevError, "resurrect_player: race set to %s, but no treasurelist of that name!\n", &spell->race); 59 LOG (llevError, "resurrect_player: race set to %s, but no treasurelist of that name!\n", &spell->race);
60 return 0; 60 return 0;
61 } 61 }
62
62 value = RANDOM () % tl->total_chance; 63 value = RANDOM () % tl->total_chance;
64
63 for (t = tl->items; t; t = t->next) 65 for (t = tl->items; t; t = t->next)
64 { 66 {
65 value -= t->chance; 67 value -= t->chance;
66 if (value < 0) 68 if (value < 0)
67 break; 69 break;
68 } 70 }
71
69 if (!t || !t->item) 72 if (!t || !t->item)
70 { 73 {
71 LOG (llevError, "resurrect_player: got null treasure from treasurelist %s!\n", &spell->race); 74 LOG (llevError, "resurrect_player: got null treasure from treasurelist %s!\n", &spell->race);
72 return 0; 75 return 0;
73 } 76 }
77
74 race = t->item->name; 78 race = t->item->archname;
75 } 79 }
76 80
77 /* set up our paths/strings... */ 81 /* set up our paths/strings... */
78 sprintf (path, "%s/%s/%s/%s", settings.localdir, settings.playerdir, playername, playername); 82 sprintf (path, "%s/%s/%s/%s", settings.localdir, settings.playerdir, playername, playername);
79 83
208 if (resurrection_fails (clevel, leveldead)) 212 if (resurrection_fails (clevel, leveldead))
209 { 213 {
210 if (spell->randomitems) 214 if (spell->randomitems)
211 for (treasure *t = spell->randomitems->items; t; t = t->next) 215 for (treasure *t = spell->randomitems->items; t; t = t->next)
212 if (t->item) 216 if (t->item)
213 summon_hostile_monsters (op, t->nrof, t->item->name); 217 summon_hostile_monsters (op, t->nrof, t->item->archname);
214 218
215 return 1; 219 return 1;
216 220
217 } 221 }
218 else 222 else

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines