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

Comparing deliantra/server/server/gods.C (file contents):
Revision 1.6 by root, Sun Sep 10 15:59:57 2006 UTC vs.
Revision 1.45 by root, Thu Jan 1 16:05:13 2009 UTC

1
2/* 1/*
3 * static char *rcsid_gods_c = 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
4 * "$Id: gods.C,v 1.6 2006/09/10 15:59:57 root Exp $"; 3 *
5 */ 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
6
7/*
8 CrossFire, A Multiplayer game for X-windows
9
10 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
11 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
12 7 *
13 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
14 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
15 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
16 (at your option) any later version. 11 * (at your option) any later version.
17 12 *
18 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,
19 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
20 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21 GNU General Public License for more details. 16 * GNU General Public License for more details.
22 17 *
23 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
24 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
26 21 * The authors can be reached via e-mail to <support@deliantra.net>
27 The authors can be reached via e-mail at crossfire-devel@real-time.com
28*/ 22 */
29
30 23
31/* Oct 3, 1995 - Code laid down for initial gods, priest alignment, and 24/* Oct 3, 1995 - Code laid down for initial gods, priest alignment, and
32 * monster race initialization. b.t. 25 * monster race initialization. b.t.
33 */ 26 */
34 27
… …
37#include <global.h> 30#include <global.h>
38#include <living.h> 31#include <living.h>
39#include <object.h> 32#include <object.h>
40#include <spells.h> 33#include <spells.h>
41#include <sounds.h> 34#include <sounds.h>
42#ifndef __CEXTRACT__
43# include <sproto.h> 35#include <sproto.h>
44#endif
45 36
46/** 37/**
47 * Returns the id of specified god. 38 * Returns the id of specified god.
48 */ 39 */
49int 40int
50lookup_god_by_name (const char *name) 41lookup_god_by_name (shstr_cmp name)
51{ 42{
52 int godnr = -1; 43 if (name)
53 size_t nmlen = strlen (name);
54
55 if (name && strcmp (name, "none"))
56 {
57 godlink *gl;
58
59 for (gl = first_god; gl; gl = gl->next) 44 for (godlink *gl = first_god; gl; gl = gl->next)
60 if (!strncmp (name, gl->name, MIN ((size_t) strlen (gl->name), nmlen))) 45 if (gl->name == name)
61 break;
62 if (gl)
63 godnr = gl->id; 46 return gl->id;
64 } 47
65 return godnr; 48 return -1;
66} 49}
67 50
68/** 51/**
69 * Returns pointer to specified god's object through pntr_to_god_obj.. 52 * Returns pointer to specified god's object through pntr_to_god_obj..
70 */ 53 */
71object * 54object *
72find_god (const char *name) 55find_god (shstr_cmp name)
73{ 56{
74 object *god = NULL;
75
76 if (name) 57 if (name)
77 {
78 godlink *gl;
79
80 for (gl = first_god; gl; gl = gl->next) 58 for (godlink *gl = first_god; gl; gl = gl->next)
81 if (!strcmp (name, gl->name)) 59 if (gl->name == name)
82 break;
83 if (gl)
84 god = pntr_to_god_obj (gl); 60 return pntr_to_god_obj (gl);
85 } 61
86 return god; 62 return 0;
63}
64
65/**
66 * Returns a string that is the name of the god that should be natively worshipped by a
67 * creature of who has race *race
68 * if we can't find a god that is appropriate, we return NULL
69 */
70static shstr_tmp
71get_god_for_race (shstr_cmp race)
72{
73 if (race)
74 for (godlink *gl = first_god; gl; gl = gl->next)
75 if (gl->arch->race == race)
76 return gl->name;
77
78 return shstr_tmp ();
87} 79}
88 80
89/** 81/**
90 * Determines if op worships a god. 82 * Determines if op worships a god.
91 * Returns the godname if they do or "none" if they have no god. 83 * Returns the godname if they do or "none" if they have no god.
92 * In the case of an NPC, if they have no god, we try and guess 84 * In the case of an NPC, if they have no god, we try and guess
93 * who they should worship based on their race. If that fails we 85 * who they should worship based on their race. If that fails we
94 * give them a random one. 86 * give them a random one.
95 */ 87 */
96 88shstr_tmp
97const char *
98determine_god (object *op) 89determine_god (object *op)
99{ 90{
100 int godnr = -1;
101 const char *godname;
102
103 /* spells */ 91 /* spells */
104 if ((op->type == SPELL || op->type == SPELL_EFFECT) && op->title) 92 if ((op->type == SPELL || op->type == SPELL_EFFECT) && op->title)
105 {
106 if (lookup_god_by_name (op->title) >= 0) 93 if (lookup_god_by_name (op->title) >= 0)
107 return op->title; 94 return op->title;
95
96 if (!op->is_player () && op->flag [FLAG_ALIVE])
108 } 97 {
109
110 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_ALIVE))
111 {
112
113 /* find a god based on race */ 98 /* find a god based on race */
114 if (!op->title) 99 if (!op->title)
115 {
116 if (op->race != NULL)
117 {
118 godname = get_god_for_race (op->race); 100 op->title = get_god_for_race (op->race);
119 if (godname != NULL)
120 {
121 op->title = godname;
122 }
123 }
124 }
125 101
126 /* find a random god */ 102 /* find a random god */
127 if (!op->title) 103 if (!op->title)
128 { 104 {
129 godlink *gl = first_god;
130
131 godnr = rndm (1, gl->id); 105 int godnr = rndm (1, first_god->id);
132 while (gl) 106
133 { 107 for (godlink *gl = first_god; gl && gl->id != godnr; gl = gl->next)
134 if (gl->id == godnr) 108 if (gl->id == godnr)
109 {
110 op->title = gl->name;
135 break; 111 break;
136 gl = gl->next;
137 } 112 }
138 op->title = gl->name;
139 } 113 }
140 114
141 return op->title; 115 return op->title;
142 } 116 }
143
144 117
145 /* The god the player worships is in the praying skill (native skill 118 /* The god the player worships is in the praying skill (native skill
146 * not skill tool). Since a player can only have one instance of 119 * not skill tool). Since a player can only have one instance of
147 * that skill, once we find it, we can return, either with the 120 * that skill, once we find it, we can return, either with the
148 * title or "none". 121 * title or "none".
149 */ 122 */
150 if (op->type == PLAYER) 123 if (op->type == PLAYER)
151 {
152 object *tmp;
153
154 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 124 for (object *tmp = op->inv; tmp; tmp = tmp->below)
155 if (tmp->type == SKILL && tmp->subtype == SK_PRAYING) 125 if (tmp->type == SKILL && tmp->subtype == SK_PRAYING)
156 { 126 {
157 if (tmp->title) 127 if (tmp->title)
158 return (tmp->title); 128 return tmp->title;
159 else 129
160 return ("none"); 130 break;
161 } 131 }
162 } 132
163 return ("none"); 133 return shstr_none;
164} 134}
165 135
166/** 136/**
167 * Returns 1 if s1 and s2 are the same - either both NULL, or strcmp( ) == 0 137 * Returns 1 if s1 and s2 are the same - either both NULL, or strcmp( ) == 0
168 */ 138 */
169static int 139static int
170same_string (const char *s1, const char *s2) 140same_string (const char *s1, const char *s2)
171{ 141{
172 if (s1 == NULL) 142 if (s1 == s2)
173 if (s2 == NULL)
174 return 1; 143 return 1;
144 else if (s1 && s2)
145 return !strcmp (s1, s2);
175 else 146 else
176 return 0;
177 else if (s2 == NULL)
178 return 0; 147 return 0;
179 else
180 return strcmp (s1, s2) == 0;
181} 148}
182
183 149
184/** 150/**
185 * Checks for any occurrence of the given 'item' in the inventory of 'op' (recursively). 151 * Checks for any occurrence of the given 'item' in the inventory of 'op' (recursively).
186 * Any matching items in the inventory are deleted, and a 152 * Any matching items in the inventory are deleted, and a
187 * message is displayed to the player. 153 * message is displayed to the player.
… …
200 166
201 if (tmp->type == item->type 167 if (tmp->type == item->type
202 && same_string (tmp->name, item->name) 168 && same_string (tmp->name, item->name)
203 && same_string (tmp->title, item->title) && same_string (tmp->msg, item->msg) && same_string (tmp->slaying, item->slaying)) 169 && same_string (tmp->title, item->title) && same_string (tmp->msg, item->msg) && same_string (tmp->slaying, item->slaying))
204 { 170 {
205
206 /* message */ 171 /* message */
207 if (tmp->nrof > 1) 172 new_draw_info_format (NDI_UNIQUE, 0, op,
208 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s crumble to dust!", query_short_name (tmp)); 173 tmp->nrof > 1 ? "The %s crumble to dust!" : "The %s crumbles to dust!",
209 else 174 query_short_name (tmp));
210 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s crumbles to dust!", query_short_name (tmp));
211 175
212 remove_ob (tmp); /* remove obj from players inv. */ 176 tmp->destroy ();
213 esrv_del_item (op->contr, tmp->count); /* notify client */
214 free_object (tmp); /* free object */
215 } 177 }
178
216 if (tmp->inv) 179 if (tmp->inv)
217 follower_remove_similar_item (tmp, item); 180 follower_remove_similar_item (tmp, item);
218 } 181 }
219 } 182 }
220} 183}
… …
244 * God gives an item to the player. 207 * God gives an item to the player.
245 */ 208 */
246static int 209static int
247god_gives_present (object *op, object *god, treasure *tr) 210god_gives_present (object *op, object *god, treasure *tr)
248{ 211{
249 object *tmp; 212 if (!tr->item)
250
251 if (follower_has_similar_item (op, &tr->item->clone))
252 return 0; 213 return 0;
253 214
215 if (follower_has_similar_item (op, tr->item))
216 return 0;
217
254 tmp = arch_to_object (tr->item); 218 object *tmp = arch_to_object (tr->item);
255 new_draw_info_format (NDI_UNIQUE, 0, op, "%s lets %s appear in your hands.", &god->name, query_short_name (tmp)); 219 new_draw_info_format (NDI_UNIQUE, 0, op, "%s lets %s appear in your hands.", &god->name, query_short_name (tmp));
256 tmp = insert_ob_in_ob (tmp, op); 220 op->insert (tmp);
257 if (op->type == PLAYER) 221
258 esrv_send_item (op, tmp);
259 return 1; 222 return 1;
260} 223}
261 224
262/** 225/**
263 * Player prays at altar. 226 * Player prays at altar.
… …
276 return; 239 return;
277 240
278 /* hmm. what happend depends on pl's current god, level, etc */ 241 /* hmm. what happend depends on pl's current god, level, etc */
279 if (!pl_god) 242 if (!pl_god)
280 { /*new convert */ 243 { /*new convert */
281 become_follower (pl, &altar->other_arch->clone); 244 become_follower (pl, altar->other_arch);
282 return; 245 return;
283
284 } 246 }
285 else if (!strcmp (&pl_god->name, altar->other_arch->clone.name)) 247 else if (!strcmp (&pl_god->name, altar->other_arch->object::name))
286 { 248 {
287 /* pray at your gods altar */ 249 /* pray at your gods altar */
288 int bonus = (pl->stats.Wis + skill->level) / 10; 250 int bonus = (pl->stats.Wis + skill->level) / 10;
289 251
290 /* we can get neg grace up faster */ 252 /* we can get neg grace up faster */
291 if (pl->stats.grace < 0) 253 if (pl->stats.grace < 0)
292 pl->stats.grace += (bonus > -1 * (pl->stats.grace / 10) ? bonus : -1 * (pl->stats.grace / 10)); 254 pl->stats.grace += (bonus > -1 * (pl->stats.grace / 10) ? bonus : -1 * (pl->stats.grace / 10));
255
293 /* we can super-charge grace to 2x max */ 256 /* we can super-charge grace to 2x max */
294 if (pl->stats.grace < (2 * pl->stats.maxgrace)) 257 if (pl->stats.grace < 2 * pl->stats.maxgrace)
295 {
296 pl->stats.grace += bonus / 2; 258 pl->stats.grace += bonus / 2;
297 } 259 else
298 if (pl->stats.grace > (2 * pl->stats.maxgrace))
299 {
300 pl->stats.grace = (2 * pl->stats.maxgrace); 260 pl->stats.grace = 2 * pl->stats.maxgrace;
301 }
302 261
303 /* Every once in a while, the god decides to checkup on their 262 /* Every once in a while, the god decides to checkup on their
304 * follower, and may intervene to help them out. 263 * follower, and may intervene to help them out.
305 */ 264 */
306 bonus = MAX (1, bonus + MAX (pl->stats.luck, -3)); /* -- DAMN -- */ 265 bonus = MAX (1, bonus + MAX (pl->stats.luck, -3)); /* -- DAMN -- */
307 266
308 if (((random_roll (0, 399, pl, PREFER_LOW)) - bonus) < 0) 267 if (((random_roll (0, 399, pl, PREFER_LOW)) - bonus) < 0)
309 god_intervention (pl, pl_god, skill); 268 god_intervention (pl, pl_god, skill);
310
311 } 269 }
312 else 270 else
313 { /* praying to another god! */ 271 { /* praying to another god! */
314 uint64 loss = 0; 272 uint64 loss = 0;
315 int angry = 1; 273 int angry = 1;
… …
319 * points to the god of this altar (which we have 277 * points to the god of this altar (which we have
320 * already verified is non null). pl_god->other_arch 278 * already verified is non null). pl_god->other_arch
321 * is the opposing god - we need to verify that exists before 279 * is the opposing god - we need to verify that exists before
322 * using its values. 280 * using its values.
323 */ 281 */
324 if (pl_god->other_arch && (altar->other_arch->name == pl_god->other_arch->name)) 282 if (pl_god->other_arch && (altar->other_arch->archname == pl_god->other_arch->archname))
325 { 283 {
326 angry = 2; 284 angry = 2;
327 if (random_roll (0, skill->level + 2, pl, PREFER_LOW) - 5 > 0) 285 if (random_roll (0, skill->level + 2, pl, PREFER_LOW) - 5 > 0)
328 { 286 {
329 object *tmp; 287 object *tmp;
… …
350 308
351 /* May switch Gods, but its random chance based on our current level 309 /* May switch Gods, but its random chance based on our current level
352 * note it gets harder to swap gods the higher we get 310 * note it gets harder to swap gods the higher we get
353 */ 311 */
354 if ((angry == 1) && !(random_roll (0, skill->level, pl, PREFER_LOW))) 312 if ((angry == 1) && !(random_roll (0, skill->level, pl, PREFER_LOW)))
355 {
356 become_follower (pl, &altar->other_arch->clone); 313 become_follower (pl, altar->other_arch);
357 }
358 else 314 else
359 { 315 {
360 /* toss this player off the altar. He can try again. */ 316 /* toss this player off the altar. He can try again. */
361 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, pl, "A divine force pushes you off the altar."); 317 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, pl, "A divine force pushes you off the altar.");
318 pl->contr->fire_on = 0;
319 pl->speed_left = 1.f;
362 move_player (pl, absdir (pl->facing + 4)); /* back him off the way he came. */ 320 move_player (pl, absdir (pl->facing + 4)); /* back him off the way he came. */
363 } 321 }
364 } 322 }
365} 323}
366 324
… …
401 remove = 1; 359 remove = 1;
402 for (tr = god->randomitems->items; tr; tr = tr->next) 360 for (tr = god->randomitems->items; tr; tr = tr->next)
403 { 361 {
404 object *item; 362 object *item;
405 363
406 if (tr->item == NULL) 364 if (!tr->item)
407 continue; 365 continue;
366
408 item = &tr->item->clone; 367 item = tr->item;
409 368
410 /* Basically, see if the matching spell is granted by this god. */ 369 /* Basically, see if the matching spell is granted by this god. */
411 370
412 if (tr->item->clone.type == SPELL && tr->item->clone.name == tmp->name) 371 if (tr->item->type == SPELL && tr->item->object::name == tmp->name)
413 { 372 {
414 remove = 0; 373 remove = 0;
415 break; 374 break;
416 } 375 }
417 } 376 }
377
418 if (remove) 378 if (remove)
419 { 379 do_forget_spell (op, tmp->name);
420 /* just do the work of removing the spell ourselves - we already
421 * know that the player knows the spell
422 */
423 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You lose knowledge of %s.", &tmp->name);
424 player_unready_range_ob (op->contr, tmp);
425 remove_ob (tmp);
426 free_object (tmp);
427 }
428
429 } 380 }
430} 381}
431 382
432/** 383/**
433 * This function is called whenever a player has 384 * This function is called whenever a player has
… …
441 object *old_god = NULL; /* old god */ 392 object *old_god = NULL; /* old god */
442 treasure *tr; 393 treasure *tr;
443 object *item, *skop, *next; 394 object *item, *skop, *next;
444 int i, sk_applied, undeadified = 0; /* Turns to true if changing god can changes the undead status of the player. */ 395 int i, sk_applied, undeadified = 0; /* Turns to true if changing god can changes the undead status of the player. */
445 396
446
447 old_god = find_god (determine_god (op)); 397 old_god = find_god (determine_god (op));
448 398
449 /* take away any special god-characteristic items. */ 399 /* take away any special god-characteristic items. */
450 for (item = op->inv; item != NULL; item = next) 400 for (item = op->inv; item; item = next)
451 { 401 {
452 next = item->below; 402 next = item->below;
403
453 /* remove all invisible startequip items which are 404 // remove all invisible startequip items which are not skill, exp or force
454 * not skill, exp or force
455 */
456 if (QUERY_FLAG (item, FLAG_STARTEQUIP) && item->invisible && 405 if (QUERY_FLAG (item, FLAG_STARTEQUIP) && item->invisible &&
457 (item->type != SKILL) && (item->type != EXPERIENCE) && (item->type != FORCE)) 406 (item->type != SKILL) && (item->type != FORCE))
458 { 407 {
459
460 if (item->type == SPELL) 408 if (item->type == SPELL)
409 {
461 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You lose knowledge of %s.", &item->name); 410 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You lose knowledge of %s.", &item->name);
411 esrv_remove_spell (op->contr, item);
412 }
413
462 player_unready_range_ob (op->contr, item); 414 player_unready_range_ob (op->contr, item);
463 remove_ob (item); 415 item->destroy ();
464 free_object (item);
465 } 416 }
466 } 417 }
467 418
468 /* remove any godgiven items from the old god */ 419 /* remove any godgiven items from the old god */
469 if (old_god) 420 if (old_god)
470 {
471 for (tr = old_god->randomitems->items; tr != NULL; tr = tr->next) 421 for (tr = old_god->randomitems->items; tr; tr = tr->next)
472 {
473 if (tr->item && QUERY_FLAG (&tr->item->clone, FLAG_STARTEQUIP)) 422 if (tr->item && QUERY_FLAG (tr->item, FLAG_STARTEQUIP))
474 follower_remove_similar_item (op, &tr->item->clone); 423 follower_remove_similar_item (op, tr->item);
475 }
476 }
477 424
478 if (!op || !new_god) 425 if (!op || !new_god)
479 return; 426 return;
480 427
481 if (op->race && new_god->slaying && strstr (op->race, new_god->slaying)) 428 if (op->race && new_god->slaying && op->race.contains (new_god->slaying))
482 { 429 {
483 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "Fool! %s detests your kind!", &new_god->name); 430 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "Fool! %s detests your kind!", &new_god->name);
431
484 if (random_roll (0, op->level - 1, op, PREFER_LOW) - 5 > 0) 432 if (random_roll (0, op->level - 1, op, PREFER_LOW) - 5 > 0)
485 { 433 {
486 object *tmp = get_archetype (LOOSE_MANA); 434 object *tmp = get_archetype (LOOSE_MANA);
487 435
488 cast_magic_storm (op, tmp, new_god->level + 10); 436 cast_magic_storm (op, tmp, new_god->level + 10);
489 } 437 }
438
490 return; 439 return;
491 } 440 }
492 441
493
494 /* give the player any special god-characteristic-items. */ 442 /* give the player any special god-characteristic-items. */
495 for (tr = new_god->randomitems->items; tr != NULL; tr = tr->next) 443 for (tr = new_god->randomitems->items; tr; tr = tr->next)
496 { 444 {
497 if (tr->item && tr->item->clone.invisible && tr->item->clone.type != SPELLBOOK && 445 if (tr->item && tr->item->invisible && tr->item->type != SPELLBOOK
498 tr->item->clone.type != BOOK && tr->item->clone.type != SPELL) 446 && tr->item->type != BOOK && tr->item->type != SPELL)
499 god_gives_present (op, new_god, tr); 447 god_gives_present (op, new_god, tr);
500 } 448 }
501 449
502
503 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You become a follower of %s!", &new_god->name); 450 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You become a follower of %s!", &new_god->name);
504 451
505 for (skop = op->inv; skop != NULL; skop = skop->below) 452 for (skop = op->inv; skop; skop = skop->below)
506 if (skop->type == SKILL && skop->subtype == SK_PRAYING) 453 if (skop->type == SKILL && skop->subtype == SK_PRAYING)
507 break; 454 break;
508 455
509 /* Player has no skill - give them the skill */ 456 /* Player has no skill - give them the skill */
510 if (!skop) 457 if (!skop)
511 {
512 /* The arhetype should always be defined - if we crash here because it doesn't, 458 /* The archetype should always be defined - if we crash here because it doesn't,
513 * things are really messed up anyways. 459 * things are really messed up anyways.
514 */ 460 */
515 skop = give_skill_by_name (op, get_archetype_by_type_subtype (SKILL, SK_PRAYING)->clone.skill); 461 skop = give_skill_by_name (op, get_archetype_by_type_subtype (SKILL, SK_PRAYING)->skill);
516 link_player_skills (op);
517 }
518 462
519 sk_applied = QUERY_FLAG (skop, FLAG_APPLIED); /* save skill status */ 463 sk_applied = QUERY_FLAG (skop, FLAG_APPLIED); /* save skill status */
520 464
521 /* Clear the "undead" status. We also need to force a call to change_abil, 465 /* Clear the "undead" status. We also need to force a call to change_abil,
522 * so I set undeadified for that. 466 * so I set undeadified for that.
523 * - gros, 21th July 2006. 467 * - gros, 21th July 2006.
524 */ 468 */
525 if ((old_god) && (QUERY_FLAG (old_god, FLAG_UNDEAD))) 469 if (old_god && QUERY_FLAG (old_god, FLAG_UNDEAD))
526 { 470 {
527 CLEAR_FLAG (skop, FLAG_UNDEAD); 471 CLEAR_FLAG (skop, FLAG_UNDEAD);
528 undeadified = 1; 472 undeadified = 1;
529 } 473 }
530 474
531 if (skop->title) 475 if (skop->title)
532 { /* get rid of old god */ 476 {
477 /* get rid of old god */
533 new_draw_info_format (NDI_UNIQUE, 0, op, "%s's blessing is withdrawn from you.", &skop->title); 478 new_draw_info_format (NDI_UNIQUE, 0, op, "%s's blessing is withdrawn from you.", &skop->title);
479
534 /* The point of this is to really show what abilities the player just lost */ 480 /* The point of this is to really show what abilities the player just lost */
535 if (sk_applied || undeadified) 481 if (sk_applied || undeadified)
536 { 482 {
537
538 CLEAR_FLAG (skop, FLAG_APPLIED); 483 CLEAR_FLAG (skop, FLAG_APPLIED);
539 (void) change_abil (op, skop); 484 change_abil (op, skop);
540 } 485 }
541 } 486 }
542 487
543 /* now change to the new gods attributes to exp_obj */ 488 /* now change to the new gods attributes to exp_obj */
544 skop->title = new_god->name; 489 skop->title = new_god->name;
… …
579 * This also can happen for monks which cannot use weapons. In this case 524 * This also can happen for monks which cannot use weapons. In this case
580 * do not allow to use weapons even if the god otherwise would allow it. 525 * do not allow to use weapons even if the god otherwise would allow it.
581 */ 526 */
582 if (!present_in_ob_by_name (FORCE, "no weapon force", op)) 527 if (!present_in_ob_by_name (FORCE, "no weapon force", op))
583 update_priest_flag (new_god, skop, FLAG_USE_WEAPON); 528 update_priest_flag (new_god, skop, FLAG_USE_WEAPON);
529
584 update_priest_flag (new_god, skop, FLAG_USE_ARMOUR); 530 update_priest_flag (new_god, skop, FLAG_USE_ARMOUR);
585 531
586 if (worship_forbids_use (op, skop, FLAG_USE_WEAPON, "weapons")) 532 if (worship_forbids_use (op, skop, FLAG_USE_WEAPON, "weapons"))
587 stop_using_item (op, WEAPON, 2); 533 stop_using_item (op, WEAPON, 2);
588 534
… …
614 */ 560 */
615 561
616int 562int
617worship_forbids_use (object *op, object *exp_obj, uint32 flag, const char *string) 563worship_forbids_use (object *op, object *exp_obj, uint32 flag, const char *string)
618{ 564{
619
620 if (QUERY_FLAG (&op->arch->clone, flag)) 565 if (QUERY_FLAG (op->arch, flag))
621 if (QUERY_FLAG (op, flag) != QUERY_FLAG (exp_obj, flag)) 566 if (QUERY_FLAG (op, flag) != QUERY_FLAG (exp_obj, flag))
622 { 567 {
623 update_priest_flag (exp_obj, op, flag); 568 update_priest_flag (exp_obj, op, flag);
624 if (QUERY_FLAG (op, flag)) 569 if (QUERY_FLAG (op, flag))
625 new_draw_info_format (NDI_UNIQUE, 0, op, "You may use %s again.", string); 570 new_draw_info_format (NDI_UNIQUE, 0, op, "You may use %s again.", string);
… …
627 { 572 {
628 new_draw_info_format (NDI_UNIQUE, 0, op, "You are forbidden to use %s.", string); 573 new_draw_info_format (NDI_UNIQUE, 0, op, "You are forbidden to use %s.", string);
629 return 1; 574 return 1;
630 } 575 }
631 } 576 }
577
632 return 0; 578 return 0;
633} 579}
634 580
635/** 581/**
636 * Unapplies up to number worth of items of type 582 * Unapplies up to number worth of items of type
… …
673/* if (!(QUERY_FLAG(&(exp_ob->arch->clone),flag)))*/ 619/* if (!(QUERY_FLAG(&(exp_ob->arch->clone),flag)))*/
674 CLEAR_FLAG (exp_ob, flag); 620 CLEAR_FLAG (exp_ob, flag);
675 }; 621 };
676} 622}
677 623
678
679
680archetype * 624archetype *
681determine_holy_arch (object *god, const char *type) 625determine_holy_arch (object *god, shstr_cmp type)
682{ 626{
683 treasure *tr; 627 treasure *tr;
684 628
685 if (!god || !god->randomitems) 629 if (!god || !god->randomitems)
686 { 630 {
687 LOG (llevError, "BUG: determine_holy_arch(): no god or god without " "randomitems\n"); 631 LOG (llevError, "BUG: determine_holy_arch(): no god or god without " "randomitems\n");
688 return NULL; 632 return 0;
689 } 633 }
690 634
691 for (tr = god->randomitems->items; tr != NULL; tr = tr->next) 635 for (tr = god->randomitems->items; tr; tr = tr->next)
692 { 636 {
693 object *item;
694
695 if (!tr->item) 637 if (!tr->item)
696 continue; 638 continue;
697 item = &tr->item->clone;
698 639
640 object *item = tr->item;
641
699 if (item->type == BOOK && item->invisible && strcmp (item->name, type) == 0) 642 if (item->type == BOOK && item->invisible && item->name == type)
700 return item->other_arch; 643 return item->other_arch;
701 } 644 }
645
702 return NULL; 646 return 0;
703} 647}
704 648
705/** 649/**
706 * God helps player by removing curse and/or damnation. 650 * God helps player by removing curse and/or damnation.
707 */ 651 */
708static int 652static int
709god_removes_curse (object *op, int remove_damnation) 653god_removes_curse (object *op, int remove_damnation)
710{ 654{
711 object *tmp;
712 int success = 0; 655 int success = 0;
713 656
714 for (tmp = op->inv; tmp; tmp = tmp->below) 657 for (object *tmp = op->inv; tmp; tmp = tmp->below)
715 { 658 {
716 if (tmp->invisible) 659 if (tmp->invisible)
717 continue; 660 continue;
661
718 if (QUERY_FLAG (tmp, FLAG_DAMNED) && !remove_damnation) 662 if (QUERY_FLAG (tmp, FLAG_DAMNED) && !remove_damnation)
719 continue; 663 continue;
664
720 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 665 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
721 { 666 {
722 success = 1; 667 success = 1;
723 CLEAR_FLAG (tmp, FLAG_DAMNED); 668 CLEAR_FLAG (tmp, FLAG_DAMNED);
724 CLEAR_FLAG (tmp, FLAG_CURSED); 669 CLEAR_FLAG (tmp, FLAG_CURSED);
725 CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED); 670 CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED);
726 if (op->type == PLAYER) 671
672 if (object *pl = tmp->visible_to ())
727 esrv_send_item (op, tmp); 673 esrv_update_item (UPD_FLAGS, pl, tmp);
728 } 674 }
729 } 675 }
730 676
731 if (success) 677 if (success)
732 new_draw_info (NDI_UNIQUE, 0, op, "You feel like someone is helping you."); 678 new_draw_info (NDI_UNIQUE, 0, op, "You feel like someone is helping you.");
679
733 return success; 680 return success;
734} 681}
735 682
736static int 683static int
737follower_level_to_enchantments (int level, int difficulty) 684follower_level_to_enchantments (int level, int difficulty)
… …
742 return 0; 689 return 0;
743 } 690 }
744 691
745 if (level <= 20) 692 if (level <= 20)
746 return level / difficulty; 693 return level / difficulty;
694
747 if (level <= 40) 695 if (level <= 40)
748 return (20 + (level - 20) / 2) / difficulty; 696 return (20 + (level - 20) / 2) / difficulty;
697
749 return (30 + (level - 40) / 4) / difficulty; 698 return (30 + (level - 40) / 4) / difficulty;
750} 699}
751 700
752/** 701/**
753 * God wants to enchant weapon. 702 * God wants to enchant weapon.
… …
756 * attacktype, slaying and such. 705 * attacktype, slaying and such.
757 */ 706 */
758static int 707static int
759god_enchants_weapon (object *op, object *god, object *tr, object *skill) 708god_enchants_weapon (object *op, object *god, object *tr, object *skill)
760{ 709{
761 char buf[MAX_BUF];
762 object *weapon; 710 object *weapon;
763 uint32 attacktype; 711 uint32 attacktype;
764 int tmp; 712 int tmp;
765 713
766 for (weapon = op->inv; weapon; weapon = weapon->below) 714 for (weapon = op->inv; weapon; weapon = weapon->below)
767 if ((weapon->type == WEAPON || weapon->type == BOW) && QUERY_FLAG (weapon, FLAG_APPLIED)) 715 if ((weapon->type == WEAPON || weapon->type == BOW) && QUERY_FLAG (weapon, FLAG_APPLIED))
768 break; 716 break;
717
769 if (weapon == NULL || god_examines_item (god, weapon) <= 0) 718 if (!weapon || god_examines_item (god, weapon) <= 0)
770 return 0; 719 return 0;
771 720
772 /* First give it a title, so other gods won't touch it */ 721 /* First give it a title, so other gods won't touch it */
773 if (!weapon->title) 722 if (!weapon->title)
774 { 723 {
775 sprintf (buf, "of %s", &god->name); 724 weapon->title = format ("of %s", &god->name);
776 weapon->title = buf; 725
777 if (op->type == PLAYER) 726 if (object *pl = weapon->visible_to ())
778 esrv_update_item (UPD_NAME, op, weapon); 727 esrv_update_item (UPD_NAME, pl, weapon);
728
779 new_draw_info (NDI_UNIQUE, 0, op, "Your weapon quivers as if struck!"); 729 new_draw_info (NDI_UNIQUE, 0, op, "Your weapon quivers as if struck!");
780 } 730 }
781 731
782 /* Allow the weapon to slay enemies */ 732 /* Allow the weapon to slay enemies */
783 if (!weapon->slaying && god->slaying) 733 if (!weapon->slaying && god->slaying)
… …
800 tmp = follower_level_to_enchantments (skill->level, tr->level); 750 tmp = follower_level_to_enchantments (skill->level, tr->level);
801 if (weapon->magic < tmp) 751 if (weapon->magic < tmp)
802 { 752 {
803 new_draw_info (NDI_UNIQUE, 0, op, "A phosphorescent glow envelops your weapon!"); 753 new_draw_info (NDI_UNIQUE, 0, op, "A phosphorescent glow envelops your weapon!");
804 weapon->magic++; 754 weapon->magic++;
805 if (op->type == PLAYER) 755
756 if (object *pl = weapon->visible_to ())
806 esrv_update_item (UPD_NAME, op, weapon); 757 esrv_update_item (UPD_NAME, pl, weapon);
758
807 return 1; 759 return 1;
808 } 760 }
809 761
810 return 0; 762 return 0;
811} 763}
812
813 764
814/** 765/**
815 * Every once in a while the god will intervene to help the worshiper. 766 * Every once in a while the god will intervene to help the worshiper.
816 * Later, this fctn can be used to supply quests, etc for the 767 * Later, this fctn can be used to supply quests, etc for the
817 * priest. -b.t. 768 * priest. -b.t.
818 * called from pray_at_altar() currently. 769 * called from pray_at_altar() currently.
819 */ 770 */
820
821void 771void
822god_intervention (object *op, object *god, object *skill) 772god_intervention (object *op, object *god, object *skill)
823{ 773{
824 treasure *tr; 774 treasure *tr;
825 775
… …
833 783
834 /* lets do some checks of whether we are kosher with our god */ 784 /* lets do some checks of whether we are kosher with our god */
835 if (god_examines_priest (op, god) < 0) 785 if (god_examines_priest (op, god) < 0)
836 return; 786 return;
837 787
788 op->play_sound (sound_find ("god_intervention"));
838 new_draw_info (NDI_UNIQUE, 0, op, "You feel a holy presence!"); 789 new_draw_info (NDI_UNIQUE, 0, op, "You feel a holy presence!");
839 790
840 for (tr = god->randomitems->items; tr != NULL; tr = tr->next) 791 for (tr = god->randomitems->items; tr; tr = tr->next)
841 { 792 {
842 object *item; 793 object *item;
843 794
844 if (tr->chance <= random_roll (0, 99, op, PREFER_HIGH)) 795 if (tr->chance <= random_roll (0, 99, op, PREFER_HIGH))
845 continue; 796 continue;
846 797
847 /* Treasurelist - generate some treasure for the follower */ 798 /* Treasurelist - generate some treasure for the follower */
848 if (tr->name) 799 if (tr->name)
849 { 800 {
850 treasurelist *tl = find_treasurelist (tr->name); 801 treasurelist *tl = treasurelist::find (tr->name);
851 802
852 if (tl == NULL) 803 if (tl == NULL)
853 continue; 804 continue;
854 805
855 new_draw_info (NDI_UNIQUE, 0, op, "Something appears before your " "eyes. You catch it before it falls to the ground."); 806 new_draw_info (NDI_UNIQUE, 0, op, "Something appears before your eyes. You catch it before it falls to the ground.");
856 807
857 create_treasure (tl, op, GT_STARTEQUIP | GT_ONLY_GOOD | GT_UPDATE_INV, skill->level, 0); 808 create_treasure (tl, op, GT_STARTEQUIP | GT_ONLY_GOOD, skill->level, 0);
858 return; 809 return;
859 } 810 }
860 811
861 if (!tr->item) 812 if (!tr->item)
862 {
863 LOG (llevError, "BUG: empty entry in %s's treasure list\n", &god->name);
864 continue; 813 continue;
865 } 814
866 item = &tr->item->clone; 815 item = tr->item;
867 816
868 /* Grace limit */ 817 /* Grace limit */
869 if (item->type == BOOK && item->invisible && strcmp (item->name, "grace limit") == 0) 818 if (item->type == BOOK && item->invisible && item->name == shstr_grace_limit)
870 { 819 {
871 if (op->stats.grace < item->stats.grace || op->stats.grace < op->stats.maxgrace) 820 if (op->stats.grace < item->stats.grace || op->stats.grace < op->stats.maxgrace)
872 { 821 {
873 object *tmp;
874
875 /* Follower lacks the required grace for the following 822 /* Follower lacks the required grace for the following
876 * treasure list items. */ 823 * treasure list items. */
877 824
878 tmp = get_archetype (HOLY_POSSESSION); 825 object *tmp = get_archetype (HOLY_POSSESSION);
879 cast_change_ability (op, op, tmp, 0, 1); 826 cast_change_ability (op, op, tmp, 0, 1);
880 free_object (tmp); 827 tmp->destroy ();
881 return; 828 return;
882 } 829 }
830
883 continue; 831 continue;
884 } 832 }
885 833
886 /* Restore grace */ 834 /* Restore grace */
887 if (item->type == BOOK && item->invisible && strcmp (item->name, "restore grace") == 0) 835 if (item->type == BOOK && item->invisible && item->name == shstr_restore_grace)
888 { 836 {
889 if (op->stats.grace >= 0) 837 if (op->stats.grace >= 0)
890 continue; 838 continue;
839
891 op->stats.grace = random_roll (0, 9, op, PREFER_HIGH); 840 op->stats.grace = random_roll (0, 9, op, PREFER_HIGH);
892 new_draw_info (NDI_UNIQUE, 0, op, "You are returned to a state of grace."); 841 new_draw_info (NDI_UNIQUE, 0, op, "You are returned to a state of grace.");
893 return; 842 return;
894 } 843 }
895 844
896 /* Heal damage */ 845 /* Heal damage */
897 if (item->type == BOOK && item->invisible && strcmp (item->name, "restore hitpoints") == 0) 846 if (item->type == BOOK && item->invisible && strcmp (item->name, "restore hitpoints") == 0)
898 { 847 {
899 if (op->stats.hp >= op->stats.maxhp) 848 if (op->stats.hp >= op->stats.maxhp)
900 continue; 849 continue;
850
901 new_draw_info (NDI_UNIQUE, 0, op, "A white light surrounds and heals you!"); 851 new_draw_info (NDI_UNIQUE, 0, op, "A white light surrounds and heals you!");
902 op->stats.hp = op->stats.maxhp; 852 op->stats.hp = op->stats.maxhp;
903 return; 853 return;
904 } 854 }
905 855
… …
911 /* Restore to 50 .. 100%, if sp < 50% */ 861 /* Restore to 50 .. 100%, if sp < 50% */
912 int new_sp = (int) (random_roll (1000, 1999, op, PREFER_HIGH) / 2000.0 * max); 862 int new_sp = (int) (random_roll (1000, 1999, op, PREFER_HIGH) / 2000.0 * max);
913 863
914 if (op->stats.sp >= max / 2) 864 if (op->stats.sp >= max / 2)
915 continue; 865 continue;
866
916 new_draw_info (NDI_UNIQUE, 0, op, "A blue lightning strikes " "your head but doesn't hurt you!"); 867 new_draw_info (NDI_UNIQUE, 0, op, "A blue lightning strikes your head but doesn't hurt you!");
917 op->stats.sp = new_sp; 868 op->stats.sp = new_sp;
918 } 869 }
919 870
920 /* Various heal spells */ 871 /* Various heal spells */
921 if (item->type == BOOK && item->invisible && strcmp (item->name, "heal spell") == 0) 872 if (item->type == BOOK && item->invisible && strcmp (item->name, "heal spell") == 0)
922 { 873 {
923 object *tmp;
924 int success;
925
926 tmp = get_archetype_by_object_name (item->slaying); 874 object *tmp = archetype::get (item->slaying);
927
928 success = cast_heal (op, op, tmp, 0); 875 int success = cast_heal (op, op, tmp, 0);
929 free_object (tmp); 876 tmp->destroy ();
877
930 if (success) 878 if (success)
931 return; 879 return;
932 else 880 else
933 continue; 881 continue;
934 } 882 }
… …
956 { 904 {
957 object *depl; 905 object *depl;
958 archetype *at; 906 archetype *at;
959 int i; 907 int i;
960 908
961 if ((at = find_archetype (ARCH_DEPLETION)) == NULL) 909 if ((at = archetype::find (ARCH_DEPLETION)) == NULL)
962 { 910 {
963 LOG (llevError, "Could not find archetype depletion.\n"); 911 LOG (llevError, "Could not find archetype depletion.\n");
964 continue; 912 continue;
965 } 913 }
914
966 depl = present_arch_in_ob (at, op); 915 depl = present_arch_in_ob (at, op);
916
967 if (depl == NULL) 917 if (depl == NULL)
968 continue; 918 continue;
919
969 new_draw_info (NDI_UNIQUE, 0, op, "Shimmering light surrounds and restores you!"); 920 new_draw_info (NDI_UNIQUE, 0, op, "Shimmering light surrounds and restores you!");
921
970 for (i = 0; i < NUM_STATS; i++) 922 for (i = 0; i < NUM_STATS; i++)
971 if (get_attr_value (&depl->stats, i)) 923 if (depl->stats.stat (i))
972 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]); 924 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]);
973 remove_ob (depl); 925
974 free_object (depl); 926 depl->destroy ();
975 fix_player (op); 927 op->update_stats ();
976 return; 928 return;
977 } 929 }
978 930
979 /* Voices */ 931 /* Voices */
980 if (item->type == BOOK && item->invisible && strcmp (item->name, "voice_behind") == 0) 932 if (item->type == BOOK && item->invisible && strcmp (item->name, "voice_behind") == 0)
981 { 933 {
982 new_draw_info (NDI_UNIQUE, 0, op, "You hear a voice from behind you, but you don't dare to " "turn around:"); 934 new_draw_info (NDI_UNIQUE, 0, op, "You hear a voice from behind you, but you don't dare to turn around:");
983 new_draw_info (NDI_WHITE, 0, op, item->msg); 935 new_draw_info (NDI_WHITE, 0, op, item->msg);
984 return; 936 return;
985 } 937 }
986 938
987 /* Messages */ 939 /* Messages */
… …
1038{ 990{
1039 int reaction = 1; 991 int reaction = 1;
1040 object *item = NULL, *skop; 992 object *item = NULL, *skop;
1041 993
1042 for (item = op->inv; item; item = item->below) 994 for (item = op->inv; item; item = item->below)
1043 {
1044 if (QUERY_FLAG (item, FLAG_APPLIED)) 995 if (QUERY_FLAG (item, FLAG_APPLIED))
1045 {
1046 reaction += god_examines_item (god, item) * (item->magic ? abs (item->magic) : 1); 996 reaction += god_examines_item (god, item) * (item->magic ? abs (item->magic) : 1);
1047 }
1048 }
1049 997
1050 /* well, well. Looks like we screwed up. Time for god's revenge */ 998 /* well, well. Looks like we screwed up. Time for god's revenge */
1051 if (reaction < 0) 999 if (reaction < 0)
1052 { 1000 {
1053 int loss = 10000000; 1001 int loss = 10000000;
1054 int angry = abs (reaction); 1002 int angry = abs (reaction);
1055 1003
1056 for (skop = op->inv; skop != NULL; skop = skop->below) 1004 for (skop = op->inv; skop; skop = skop->below)
1057 if (skop->type == SKILL && skop->subtype == SK_PRAYING) 1005 if (skop->type == SKILL && skop->subtype == SK_PRAYING)
1058 break; 1006 break;
1059 1007
1060 if (skop) 1008 if (skop)
1061 loss = (int) (0.05 * (float) skop->stats.exp); 1009 loss = 0.05f * skop->stats.exp;
1010
1062 change_exp (op, -random_roll (0, loss * angry - 1, op, PREFER_LOW), skop ? &skop->skill : "none", SK_SUBTRACT_SKILL_EXP); 1011 change_exp (op, -random_roll (0, loss * angry - 1, op, PREFER_LOW), skop ? &skop->skill : "none", SK_SUBTRACT_SKILL_EXP);
1012
1063 if (random_roll (0, angry, op, PREFER_LOW)) 1013 if (random_roll (0, angry, op, PREFER_LOW))
1064 { 1014 {
1065 object *tmp = get_archetype (LOOSE_MANA); 1015 object *tmp = get_archetype (LOOSE_MANA);
1066 1016
1067 cast_magic_storm (op, tmp, op->level + (angry * 3)); 1017 cast_magic_storm (op, tmp, op->level + (angry * 3));
1068 } 1018 }
1019
1069 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "%s becomes angry and punishes you!", &god->name); 1020 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "%s becomes angry and punishes you!", &god->name);
1070 } 1021 }
1022
1071 return reaction; 1023 return reaction;
1072} 1024}
1073 1025
1074/** 1026/**
1075 * God checks item the player is using. 1027 * God checks item the player is using.
1076 * Return either -1 (bad), 0 (neutral) or 1028 * Return either -1 (bad), 0 (neutral) or
1077 * 1 (item is ok). If you are using the item of an enemy 1029 * 1 (item is ok). If you are using the item of an enemy
1078 * god, it can be bad...-b.t. 1030 * god, it can be bad...-b.t.
1079 */ 1031 */
1080
1081int 1032int
1082god_examines_item (object *god, object *item) 1033god_examines_item (object *god, object *item)
1083{ 1034{
1084 char buf[MAX_BUF]; 1035 char buf[MAX_BUF];
1085 1036
… …
1088 1039
1089 if (!item->title) 1040 if (!item->title)
1090 return 1; /* unclaimed item are ok */ 1041 return 1; /* unclaimed item are ok */
1091 1042
1092 sprintf (buf, "of %s", &god->name); 1043 sprintf (buf, "of %s", &god->name);
1093 if (!strcmp (item->title, buf)) 1044 if (!strcmp (&item->title, buf))
1094 return 1; /* belongs to that God */ 1045 return 1; /* belongs to that God */
1095 1046
1096 if (god->title) 1047 if (god->title)
1097 { /* check if we have any enemy blessed item */ 1048 { /* check if we have any enemy blessed item */
1098 sprintf (buf, "of %s", &god->title); 1049 sprintf (buf, "of %s", &god->title);
1099 if (!strcmp (item->title, buf)) 1050 if (!strcmp (&item->title, buf))
1100 { 1051 {
1101 if (item->env) 1052 if (item->env)
1102 { 1053 {
1103 char buf[MAX_BUF]; 1054 char buf[MAX_BUF];
1104 1055
1105 sprintf (buf, "Heretic! You are using %s!", query_name (item)); 1056 sprintf (buf, "Heretic! You are using %s!", query_name (item));
1106 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, item->env, buf); 1057 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, item->env, buf);
1107 } 1058 }
1059
1108 return -1; 1060 return -1;
1109 } 1061 }
1110 } 1062 }
1111 1063
1112 return 0; /* item is sacred to a non-enemy god/or is otherwise magical */ 1064 return 0; /* item is sacred to a non-enemy god/or is otherwise magical */
… …
1114 1066
1115/** 1067/**
1116 * Returns priest's god's id. 1068 * Returns priest's god's id.
1117 * Straight calls lookup_god_by_name 1069 * Straight calls lookup_god_by_name
1118 */ 1070 */
1119
1120int 1071int
1121get_god (object *priest) 1072get_god (object *priest)
1122{ 1073{
1123 int godnr = lookup_god_by_name (determine_god (priest)); 1074 return lookup_god_by_name (determine_god (priest));
1124
1125 return godnr;
1126}
1127
1128/**
1129 * Returns a string that is the name of the god that should be natively worshipped by a
1130 * creature of who has race *race
1131 * if we can't find a god that is appropriate, we return NULL
1132 */
1133const char *
1134get_god_for_race (const char *race)
1135{
1136 godlink *gl = first_god;
1137 const char *godname = NULL;
1138
1139 if (race == NULL)
1140 return NULL;
1141 while (gl)
1142 {
1143 if (!strcasecmp (gl->arch->clone.race, race))
1144 {
1145 godname = gl->name;
1146 break;
1147 }
1148 gl = gl->next;
1149 }
1150 return godname;
1151} 1075}
1152 1076
1153/** 1077/**
1154 * Changes the attributes of cone, smite, and ball spells as needed by the code. 1078 * Changes the attributes of cone, smite, and ball spells as needed by the code.
1155 * Returns false if there was no race to assign to the slaying field of the spell, but 1079 * Returns false if there was no race to assign to the slaying field of the spell, but
1156 * the spell attacktype contains AT_HOLYWORD. -b.t. 1080 * the spell attacktype contains AT_HOLYWORD. -b.t.
1157 */ 1081 */
1158
1159int 1082int
1160tailor_god_spell (object *spellop, object *caster) 1083tailor_god_spell (object *spellop, object *caster)
1161{ 1084{
1162 object *god = find_god (determine_god (caster)); 1085 object *god = find_god (determine_god (caster));
1163 int caster_is_spell = 0; 1086 int caster_is_spell = 0;
… …
1167 1090
1168 /* if caster is a rune or the like, it doesn't worship anything. However, 1091 /* if caster is a rune or the like, it doesn't worship anything. However,
1169 * if this object is owned by someone, then the god that they worship 1092 * if this object is owned by someone, then the god that they worship
1170 * is relevant, so use that. 1093 * is relevant, so use that.
1171 */ 1094 */
1172 if (!god && get_owner (caster)) 1095 if (!god && caster->owner)
1173 god = find_god (determine_god (get_owner (caster))); 1096 god = find_god (determine_god (caster->owner));
1174 1097
1175 if (!god || (spellop->attacktype & AT_HOLYWORD && !god->race)) 1098 if (!god || (spellop->attacktype & AT_HOLYWORD && !god->race))
1176 { 1099 {
1177 if (!caster_is_spell) 1100 if (!caster_is_spell)
1178 new_draw_info (NDI_UNIQUE, 0, caster, "This prayer is useless unless you worship an appropriate god"); 1101 new_draw_info (NDI_UNIQUE, 0, caster, "This prayer is useless unless you worship an appropriate god");
1179 else 1102 else
1180 LOG (llevError, "BUG: tailor_god_spell(): no god\n"); 1103 LOG (llevError, "BUG: tailor_god_spell(): no god\n");
1181 free_object (spellop); 1104
1105 spellop->destroy ();
1182 return 0; 1106 return 0;
1183 } 1107 }
1184 1108
1185 /* either holy word or godpower attacks will set the slaying field */ 1109 /* either holy word or godpower attacks will set the slaying field */
1186 if (spellop->attacktype & AT_HOLYWORD || spellop->attacktype & AT_GODPOWER) 1110 if (spellop->attacktype & AT_HOLYWORD || spellop->attacktype & AT_GODPOWER)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines