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.10 by root, Mon Dec 11 21:32:18 2006 UTC vs.
Revision 1.17 by pippijn, Sat Jan 6 14:42:31 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
3 3
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
6 7
7 This program is free software; you can redistribute it and/or modify 8 This program is free software; you can redistribute it and/or modify
8 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
23 24
24/* 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
25 all of the above disclaimers apply. */ 26 all of the above disclaimers apply. */
26 27
27#include <global.h> 28#include <global.h>
28#ifndef __CEXTRACT__
29# include <sproto.h> 29#include <sproto.h>
30#endif
31#include <spells.h> 30#include <spells.h>
32#include <errno.h> 31#include <errno.h>
33#ifdef sequent
34 32
35/* stoopid sequent includes don't do this like they should */
36extern char *sys_errlist[];
37extern int sys_nerr;
38#endif
39extern char **classname; 33extern char **classname;
40extern object *objects; 34extern object *objects;
41
42
43 35
44/* name of the person to resurrect and which spell was used 36/* name of the person to resurrect and which spell was used
45 * to resurrect 37 * to resurrect
46 */ 38 */
47static int 39static int
56 char buf2[MAX_BUF]; 48 char buf2[MAX_BUF];
57 const char *race = NULL; 49 const char *race = NULL;
58 sint64 exp; 50 sint64 exp;
59 int Con; 51 int Con;
60 52
61
62 /* reincarnation, which changes the race */ 53 /* reincarnation, which changes the race */
63 if (spell->race) 54 if (spell->race)
64 { 55 {
65 treasurelist *tl = find_treasurelist (spell->race); 56 treasurelist *tl = find_treasurelist (spell->race);
66 treasure *t; 57 treasure *t;
76 { 67 {
77 value -= t->chance; 68 value -= t->chance;
78 if (value < 0) 69 if (value < 0)
79 break; 70 break;
80 } 71 }
81 if (!t) 72 if (!t || !t->item)
82 { 73 {
83 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);
84 return 0; 75 return 0;
85 } 76 }
86 race = t->item->name; 77 race = t->item->name;
189 temp = NULL; 180 temp = NULL;
190 else 181 else
191 { 182 {
192 /* First we need to find a corpse, if any. */ 183 /* First we need to find a corpse, if any. */
193 /* If no object, temp will be set to NULL */ 184 /* If no object, temp will be set to NULL */
194 for (temp = get_map_ob (m, sx, sy); temp != NULL; temp = temp->above) 185 for (temp = GET_MAP_OB (m, sx, sy); temp != NULL; temp = temp->above)
195 /* If it is corpse, this must be what we want to raise */ 186 /* If it is corpse, this must be what we want to raise */
196 if (temp->type == CORPSE) 187 if (temp->type == CORPSE)
197 break; 188 break;
198 } 189 }
199 190
208 /* no matter what, we fry the corpse. */ 199 /* no matter what, we fry the corpse. */
209 if (temp && temp->map) 200 if (temp && temp->map)
210 { 201 {
211 /* replace corpse object with a burning object */ 202 /* replace corpse object with a burning object */
212 newob = arch_to_object (archetype::find ("burnout")); 203 newob = arch_to_object (archetype::find ("burnout"));
213 if (newob != NULL) 204 if (newob)
214 { 205 newob->insert_at (temp, op);
215 newob->x = temp->x; 206
216 newob->y = temp->y;
217 insert_ob_in_map (newob, temp->map, op, 0);
218 }
219 leveldead = temp->level; 207 leveldead = temp->level;
220 remove_ob (temp); 208 temp->destroy ();
221 free_object (temp);
222 } 209 }
223 210
224 if (resurrection_fails (clevel, leveldead)) 211 if (resurrection_fails (clevel, leveldead))
225 { 212 {
226 if (spell->randomitems) 213 if (spell->randomitems)
227 {
228 treasure *t;
229
230 for (t = spell->randomitems->items; t; t = t->next) 214 for (treasure *t = spell->randomitems->items; t; t = t->next)
231 { 215 if (t->item)
232 summon_hostile_monsters (op, t->nrof, t->item->name); 216 summon_hostile_monsters (op, t->nrof, t->item->name);
233 }
234 217
235 }
236 return 1; 218 return 1;
237 219
238 } 220 }
239 else 221 else
240 {
241 return resurrect_player (op, name_to_resurrect, spell); 222 return resurrect_player (op, name_to_resurrect, spell);
242 }
243
244 return 1;
245} 223}
246 224
247 225
248int 226int
249resurrection_fails (int levelcaster, int leveldead) 227resurrection_fails (int levelcaster, int leveldead)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines