ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/server/spell_effect.C

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.85 by root, Sun Aug 17 22:46:26 2008 UTC vs.
Revision 1.127 by root, Wed Apr 14 02:31:24 2010 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,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 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 it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) 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,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License 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 Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
…		…
63	int ncharges;	64	int ncharges;
64		65
65	wand = find_marked_object (op);	66	wand = find_marked_object (op);
66	if (!wand || wand->type != WAND)	67	if (!wand || wand->type != WAND)
67	{	68	{
68	new_draw_info (NDI_UNIQUE, 0, op, "You need to mark the wand you want to recharge.");	69	op->failmsg ("You need to mark the wand you want to recharge.");
69	return 0;	70	return 0;
70	}	71	}
		72
71	if (!(random_roll (0, 3, op, PREFER_HIGH)))	73	if (!(random_roll (0, 3, op, PREFER_HIGH)))
72	{	74	{
73	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s vibrates violently, then explodes!", query_name (wand));	75	op->failmsgf ("The %s vibrates violently, then explodes!", query_name (wand));
74	op->play_sound (sound_find ("ob_explode"));	76	op->play_sound (sound_find ("ob_explode"));
75	wand->destroy ();	77	wand->destroy ();
76	tmp = get_archetype ("fireball");	78	tmp = get_archetype (shstr_fireball);
77	tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10;	79	tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10;
78		80
79	if (!tmp->stats.dam)	81	if (!tmp->stats.dam)
80	tmp->stats.dam = 1;	82	tmp->stats.dam = 1;
81		83
…		…
92		94
93	if (wand->inv && wand->inv->level)	95	if (wand->inv && wand->inv->level)
94	ncharges /= wand->inv->level;	96	ncharges /= wand->inv->level;
95	else	97	else
96	{	98	{
97	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", query_name (wand));	99	op->failmsgf ("Your %s is broken.", query_name (wand));
98	return 0;	100	return 0;
99	}	101	}
100		102
101	if (!ncharges)	103	if (!ncharges)
102	ncharges = 1;	104	ncharges = 1;
103		105
104	wand->stats.food += ncharges;	106	wand->stats.food += ncharges;
105	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand));	107	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand));
106		108
107	if (wand->arch && QUERY_FLAG (wand->arch, FLAG_ANIMATE))	109	if (wand->arch && wand->arch->flag [FLAG_ANIMATE])
108	{	110	{
109	SET_FLAG (wand, FLAG_ANIMATE);	111	wand->set_flag (FLAG_ANIMATE);
110	wand->set_speed (wand->arch->speed);	112	wand->set_speed (wand->arch->speed);
111	}	113	}
112		114
113	return 1;	115	return 1;
114	}	116	}
…		…
122	* The # of arrows created also goes up with level, so if a 30th level mage	124	* The # of arrows created also goes up with level, so if a 30th level mage
123	* wants LOTS of arrows, and doesn't care what the plus is he could	125	* wants LOTS of arrows, and doesn't care what the plus is he could
124	* create nonnmagic arrows, or even -1, etc...	126	* create nonnmagic arrows, or even -1, etc...
125	*/	127	*/
126	int	128	int
127	cast_create_missile (object *op, object *caster, object *spell, int dir, const char *stringarg)	129	cast_create_missile (object *op, object *caster, object *spell, int dir, const char *spellparam)
128	{	130	{
129	int bonus_plus = 0;	131	int bonus_plus = 0;
130	const char *missile_name = "arrow";	132	const char *missile_name = "arrow";
131		133
132	for (object *tmp = op->inv; tmp; tmp = tmp->below)	134	for (object *tmp = op->inv; tmp; tmp = tmp->below)
133	if (tmp->type == BOW && QUERY_FLAG (tmp, FLAG_APPLIED))	135	if (tmp->type == BOW && tmp->flag [FLAG_APPLIED])
134	missile_name = tmp->race;	136	missile_name = tmp->race;
135		137
136	int missile_plus = spell->stats.dam + SP_level_dam_adjust (caster, spell);	138	int missile_plus = spell->stats.dam + SP_level_dam_adjust (caster, spell);
137		139
138	archetype *missile_arch = archetype::find (missile_name);	140	archetype *missile_arch = archetype::find (missile_name);
…		…
143	return 0;	145	return 0;
144	}	146	}
145		147
146	object *missile = missile_arch->instance ();	148	object *missile = missile_arch->instance ();
147		149
148	if (stringarg)	150	if (spellparam)
149	{	151	{
150	/* If it starts with a letter, presume it is a description */	152	/* If it starts with a letter, presume it is a description */
151	if (isalpha (*stringarg))	153	if (isalpha (*spellparam))
152	{	154	{
153	artifact *al = find_artifactlist (missile->type)->items;	155	artifact *al = find_artifactlist (missile->type)->items;
154		156
155	for (; al; al = al->next)	157	for (; al; al = al->next)
156	if (!strcasecmp (al->item->name, stringarg))	158	if (!strcasecmp (al->item->name, spellparam))
157	break;	159	break;
158		160
159	if (!al)	161	if (!al)
160	{	162	{
161	missile->destroy ();	163	missile->destroy ();
162	new_draw_info_format (NDI_UNIQUE, 0, op, "No such object %ss of %s", missile_name, stringarg);	164	op->failmsgf ("No such object %ss of %s", missile_name, spellparam);
163	return 0;	165	return 0;
164	}	166	}
165		167
166	if (al->item->slaying)	168	if (al->item->slaying)
167	{	169	{
168	missile->destroy ();	170	missile->destroy ();
169	new_draw_info_format (NDI_UNIQUE, 0, op, "You are not allowed to create %ss of %s", missile_name, stringarg);	171	op->failmsgf ("You are not allowed to create %ss of %s", missile_name, spellparam);
170	return 0;	172	return 0;
171	}	173	}
172		174
173	give_artifact_abilities (missile, al->item);	175	give_artifact_abilities (missile, al->item);
174	/* These special arrows cost something extra. Don't have them also be magical -	176	/* These special arrows cost something extra. Don't have them also be magical -
…		…
176	* the parsing of having to do both plus and type.	178	* the parsing of having to do both plus and type.
177	*/	179	*/
178	bonus_plus = 1 + (al->item->value / 5);	180	bonus_plus = 1 + (al->item->value / 5);
179	missile_plus = 0;	181	missile_plus = 0;
180	}	182	}
181	else if (atoi (stringarg) < missile_plus)	183	else if (atoi (spellparam) < missile_plus)
182	missile_plus = atoi (stringarg);	184	missile_plus = atoi (spellparam);
183	}	185	}
184		186
185	missile_plus = clamp (missile_plus, -4, 4);	187	missile_plus = clamp (missile_plus, -4, 4);
186		188
187	missile->nrof = spell->duration + SP_level_duration_adjust (caster, spell);	189	missile->nrof = spell->duration + SP_level_duration_adjust (caster, spell);
…		…
192		194
193	missile->magic = missile_plus;	195	missile->magic = missile_plus;
194	/* Can't get any money for these objects */	196	/* Can't get any money for these objects */
195	missile->value = 0;	197	missile->value = 0;
196		198
197	SET_FLAG (missile, FLAG_IDENTIFIED);	199	missile->set_flag (FLAG_IDENTIFIED);
198		200
199	if (!cast_create_obj (op, caster, missile, dir) && op->type == PLAYER && !missile->destroyed ())	201	if (!cast_create_obj (op, caster, missile, dir) && op->type == PLAYER && !missile->destroyed ())
200	pick_up (op, missile);	202	pick_up (op, missile);
201		203
202	return 1;	204	return 1;
203	}	205	}
204		206
205		207
206	/* allows the choice of what sort of food object to make.	208	/* allows the choice of what sort of food object to make.
207	* If stringarg is NULL, it will create food dependent on level --PeterM*/	209	* If spellparam is NULL, it will create food dependent on level --PeterM*/
208	int	210	int
209	cast_create_food (object *op, object *caster, object *spell_ob, int dir, const char *stringarg)	211	cast_create_food (object *op, object *caster, object *spell_ob, int dir, const char *spellparam)
210	{	212	{
211	int food_value;	213	int food_value;
212	archetype *at = NULL;	214	archetype *at = NULL;
213	object *new_op;	215	object *new_op;
214		216
215	food_value = spell_ob->stats.food + 50 * SP_level_duration_adjust (caster, spell_ob);	217	food_value = spell_ob->stats.food + 50 * SP_level_duration_adjust (caster, spell_ob);
216		218
217	if (stringarg)	219	if (spellparam)
218	{	220	{
219	at = find_archetype_by_object_type_name (FOOD, stringarg);	221	at = find_archetype_by_object_type_name (FOOD, spellparam);
220	if (at == NULL)	222	if (at == NULL)
221	at = find_archetype_by_object_type_name (DRINK, stringarg);	223	at = find_archetype_by_object_type_name (DRINK, spellparam);
222	if (at == NULL || at->stats.food > food_value)	224	if (at == NULL || at->stats.food > food_value)
223	stringarg = NULL;	225	spellparam = NULL;
224	}	226	}
225		227
226	if (!stringarg)	228	if (!spellparam)
227	{	229	{
228	archetype *at_tmp;	230	archetype *at_tmp;
229		231
230	/* We try to find the archetype with the maximum food value.	232	/* We try to find the archetype with the maximum food value.
231	* This removes the dependancy of hard coded food values in this	233	* This removes the dependancy of hard coded food values in this
…		…
256	/* Pretty unlikely (there are some very low food items), but you never	258	/* Pretty unlikely (there are some very low food items), but you never
257	* know	259	* know
258	*/	260	*/
259	if (!at)	261	if (!at)
260	{	262	{
261	new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough experience to create any food.");	263	op->failmsgf ("You don't have enough experience to create any food.");
262	return 0;	264	return 0;
263	}	265	}
264		266
265	food_value /= at->stats.food;	267	food_value /= at->stats.food;
266	new_op = arch_to_object (at);	268	new_op = at->instance ();
267	new_op->nrof = food_value;	269	new_op->nrof = food_value;
268		270
269	new_op->value = 0;	271	new_op->value = 0;
270	if (new_op->nrof < 1)	272	if (new_op->nrof < 1)
271	new_op->nrof = 1;	273	new_op->nrof = 1;
…		…
296	mflags = get_map_flags (m, &m, x, y, &x, &y);	298	mflags = get_map_flags (m, &m, x, y, &x, &y);
297		299
298	if (mflags & P_OUT_OF_MAP)	300	if (mflags & P_OUT_OF_MAP)
299	break;	301	break;
300		302
301	if (!QUERY_FLAG (op, FLAG_WIZCAST) && (mflags & P_NO_MAGIC))	303	if (!op->flag [FLAG_WIZCAST] && (mflags & P_NO_MAGIC))
302	{	304	{
303	new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic.");	305	new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic.");
304	return 0;	306	return 0;
305	}	307	}
306		308
307	if (mflags & P_IS_ALIVE)	309	if (mflags & P_IS_ALIVE)
308	{	310	{
309	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	311	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
310	if (QUERY_FLAG (tmp, FLAG_ALIVE) && (tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))	312	if (tmp->flag [FLAG_ALIVE] && (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
311	{	313	{
312	new_draw_info (NDI_UNIQUE, 0, op, "You detect something.");	314	new_draw_info (NDI_UNIQUE, 0, op, "You detect something.");
313	if (tmp->head != NULL)	315	if (tmp->head != NULL)
314	tmp = tmp->head;	316	tmp = tmp->head;
315	examine_monster (op, tmp);	317	examine_monster (op, tmp);
…		…
338	if (pl->type == PLAYER)	340	if (pl->type == PLAYER)
339	{	341	{
340	/* If race isn't set, then invisible unless it is undead */	342	/* If race isn't set, then invisible unless it is undead */
341	if (!pl->contr->invis_race)	343	if (!pl->contr->invis_race)
342	{	344	{
343	if (QUERY_FLAG (mon, FLAG_UNDEAD))	345	if (mon->flag [FLAG_UNDEAD])
344	return 0;	346	return 0;
345		347
346	return 1;	348	return 1;
347	}	349	}
348		350
349	/* invis_race is set if we get here */	351	/* invis_race is set if we get here */
350	if (!strcmp (pl->contr->invis_race, "undead") && is_true_undead (mon))	352	if (pl->contr->invis_race == shstr_undead && is_true_undead (mon))
351	return 1;	353	return 1;
352		354
353	/* No race, can't be invisible to it */	355	/* No race, can't be invisible to it */
354	if (!mon->race)	356	if (!mon->race)
355	return 0;	357	return 0;
356		358
357	if (strstr (mon->race, pl->contr->invis_race))	359	if (mon->race.contains (pl->contr->invis_race))
358	return 1;	360	return 1;
359		361
360	/* Nothing matched above, return 0 */	362	/* Nothing matched above, return 0 */
361	return 0;	363	return 0;
362	}	364	}
…		…
379	int	381	int
380	cast_invisible (object *op, object *caster, object *spell_ob)	382	cast_invisible (object *op, object *caster, object *spell_ob)
381	{	383	{
382	if (op->invisible > 1000)	384	if (op->invisible > 1000)
383	{	385	{
384	new_draw_info (NDI_UNIQUE, 0, op, "You can not extend the duration of your invisibility any further");	386	op->failmsg ("You can not extend the duration of your invisibility any further");
385	return 0;	387	return 0;
386	}	388	}
387		389
388	/* Remove the switch with 90% duplicate code - just handle the differences with	390	/* Remove the switch with 90% duplicate code - just handle the differences with
389	* and if statement or two.	391	* and if statement or two.
…		…
395		397
396	if (op->type == PLAYER)	398	if (op->type == PLAYER)
397	{	399	{
398	op->contr->invis_race = spell_ob->race;	400	op->contr->invis_race = spell_ob->race;
399		401
400	if (QUERY_FLAG (spell_ob, FLAG_MAKE_INVIS))	402	if (spell_ob->flag [FLAG_MAKE_INVIS])
401	op->contr->tmp_invis = 0;	403	op->contr->tmp_invis = 0;
402	else	404	else
403	op->contr->tmp_invis = 1;	405	op->contr->tmp_invis = 1;
404		406
405	op->contr->hidden = 0;	407	op->contr->hidden = 0;
…		…
425	/* earth to dust spell. Basically destroys earthwalls in the area.	427	/* earth to dust spell. Basically destroys earthwalls in the area.
426	*/	428	*/
427	int	429	int
428	cast_earth_to_dust (object *op, object *caster, object *spell_ob)	430	cast_earth_to_dust (object *op, object *caster, object *spell_ob)
429	{	431	{
430	object *tmp, *next;
431	int range, i, j, mflags;	432	int range, i, j, mflags;
432	sint16 sx, sy;	433	sint16 sx, sy;
433	maptile *m;	434	maptile *m;
434
435	if (op->type != PLAYER)
436	return 0;
437		435
438	range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);	436	range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
439		437
440	for (i = -range; i <= range; i++)	438	for (i = -range; i <= range; i++)
441	for (j = -range; j <= range; j++)	439	for (j = -range; j <= range; j++)
…		…
446	mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);	444	mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
447		445
448	if (mflags & P_OUT_OF_MAP)	446	if (mflags & P_OUT_OF_MAP)
449	continue;	447	continue;
450		448
451	// earth to dust tears down everything that can be teared down	449	// earth to dust tears down everything that can be torn down
452	for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = next)	450	for (object *next, *tmp = m->at (sx, sy).bot; tmp; tmp = next)
453	{	451	{
454	next = tmp->above;	452	next = tmp->above;
455	if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN))	453
		454	if (tmp->flag [FLAG_TEAR_DOWN])
456	hit_player (tmp, 9998, op, AT_PHYSICAL, 0);	455	hit_player (tmp, 9998, op, AT_PHYSICAL, 0);
457	}	456	}
458	}	457	}
459		458
460	return 1;	459	return 1;
…		…
463	void	462	void
464	execute_word_of_recall (object *op)	463	execute_word_of_recall (object *op)
465	{	464	{
466	if (object *pl = op->in_player ())	465	if (object *pl = op->in_player ())
467	{	466	{
468	if (pl->ms ().flags () & P_NO_CLERIC && !QUERY_FLAG (pl, FLAG_WIZCAST))	467	if (pl->ms ().flags () & P_NO_CLERIC && !pl->flag [FLAG_WIZCAST])
469	new_draw_info (NDI_UNIQUE, 0, pl, "You feel something fizzle inside you.");	468	new_draw_info (NDI_UNIQUE, 0, pl, "You feel something fizzle inside you.");
470	else	469	else
471	pl->player_goto (op->slaying, op->stats.hp, op->stats.sp);	470	pl->player_goto (op->slaying, op->stats.hp, op->stats.sp);
472	}	471	}
473		472
…		…
567		566
568	int	567	int
569	perceive_self (object *op)	568	perceive_self (object *op)
570	{	569	{
571	const char *cp = describe_item (op, op);	570	const char *cp = describe_item (op, op);
572	archetype *at = archetype::find (ARCH_DEPLETION);	571	archetype *at = archetype::find (shstr_depletion);
573		572
574	dynbuf_text buf;	573	dynbuf_text &buf = msg_dynbuf; buf.clear ();
575		574
576	if (player *pl = op->contr)	575	if (!op->is_player ())
		576	return 0;
		577
577	if (object *race = archetype::find (op->race))	578	if (object *race = archetype::find (op->race))
578	buf << "You are a " << (pl->gender ? "female" : "male") << " " << &race->name << ".\n";	579	buf << " - You are a G<male|female> " << &race->name << ".\n";
579		580
580	if (object *god = find_god (determine_god (op)))	581	if (object *god = find_god (determine_god (op)))
581	buf << "You worship " << &god->name << ".\n";	582	buf << " - You worship " << &god->name << ".\n";
582	else	583	else
583	buf << "You worship no god.\n";	584	buf << " - You worship no god.\n";
584		585
585	object *tmp = present_arch_in_ob (at, op);	586	object *tmp = present_arch_in_ob (at, op);
586		587
587	if (*cp == '\0' && tmp == NULL)	588	if (*cp == '\0' && !tmp)
588	buf << "You feel very mundane. ";	589	buf << " - You feel very mundane. ";
589	else	590	else
590	{	591	{
591	buf << "You have: " << cp << ".\n";	592	buf << " - You have: " << cp << ".\n";
592		593
593	if (tmp)	594	if (tmp)
594	for (int i = 0; i < NUM_STATS; i++)	595	for (int i = 0; i < NUM_STATS; i++)
595	if (tmp->stats.stat (i) < 0)	596	if (tmp->stats.stat (i) < 0)
596	buf.printf ("Your %s is depleted by %d.\n", statname[i], -tmp->stats.stat (i));	597	buf.printf (" - Your %s is depleted by %d.\n", statname[i], -tmp->stats.stat (i));
597	}	598	}
598		599
599	if (is_dragon_pl (op))	600	if (op->is_dragon ())
600	/* now grab the 'dragon_ability'-force from the player's inventory */	601	/* now grab the 'dragon_ability'-force from the player's inventory */
601	for (tmp = op->inv; tmp; tmp = tmp->below)	602	for (tmp = op->inv; tmp; tmp = tmp->below)
602	{	603	{
603	if (tmp->type == FORCE && tmp->arch->archname == shstr_dragon_ability_force)	604	if (tmp->type == FORCE && tmp->arch->archname == shstr_dragon_ability_force)
604	{	605	{
605	if (tmp->stats.exp == 0)	606	if (tmp->stats.exp == 0)
606	buf << "Your metabolism isn't focused on anything.\n";	607	buf << " - Your metabolism isn't focused on anything.\n";
607	else	608	else
608	buf << "Your metabolism is focused on " << change_resist_msg[tmp->stats.exp] << ".\n";	609	buf << " - Your metabolism is focused on " << change_resist_msg[tmp->stats.exp] << ".\n";
609		610
610	break;	611	break;
611	}	612	}
612	}	613	}
613		614
614	buf << '\0'; // zero-terminate	615	op->contr->infobox (MSG_CHANNEL ("perceiveself"), buf);
615
616	new_draw_info (NDI_UNIQUE, 0, op, buf.linearise ());
617		616
618	return 1;	617	return 1;
619	}	618	}
620		619
621	/* This creates magic walls. Really, it can create most any object,	620	/* This creates magic walls. Really, it can create most any object,
…		…
647		646
648	if ((spell_ob->move_block || x != op->x || y != op->y) &&	647	if ((spell_ob->move_block || x != op->x || y != op->y) &&
649	(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE) ||	648	(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE) ||
650	((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) == spell_ob->move_block)))	649	((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) == spell_ob->move_block)))
651	{	650	{
652	new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");	651	op->failmsg ("Something is in the way.");
653	return 0;	652	return 0;
654	}	653	}
655		654
656	if (spell_ob->other_arch)	655	if (spell_ob->other_arch)
657	tmp = arch_to_object (spell_ob->other_arch);	656	tmp = spell_ob->other_arch->instance ();
658	else if (spell_ob->race)	657	else if (spell_ob->race)
659	{	658	{
660	char buf1[MAX_BUF];	659	char buf1[MAX_BUF];
661		660
662	sprintf (buf1, spell_ob->race, dir);	661	sprintf (buf1, spell_ob->race, dir);
…		…
666	LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1);	665	LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1);
667	new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken.");	666	new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken.");
668	return 0;	667	return 0;
669	}	668	}
670		669
671	tmp = arch_to_object (at);	670	tmp = at->instance ();
672	}	671	}
673	else	672	else
674	{	673	{
675	LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name);	674	LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name);
676	return 0;	675	return 0;
…		…
681	tmp->attacktype = spell_ob->attacktype;	680	tmp->attacktype = spell_ob->attacktype;
682	tmp->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);	681	tmp->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
683	tmp->stats.dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);	682	tmp->stats.dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
684	tmp->range = 0;	683	tmp->range = 0;
685	}	684	}
686	else if (QUERY_FLAG (tmp, FLAG_ALIVE))	685	else if (tmp->flag [FLAG_ALIVE])
687	{	686	{
688	tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);	687	tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
689	tmp->stats.maxhp = tmp->stats.hp;	688	tmp->stats.maxhp = tmp->stats.hp;
690	}	689	}
691		690
692	if (QUERY_FLAG (spell_ob, FLAG_IS_USED_UP) || QUERY_FLAG (tmp, FLAG_IS_USED_UP))	691	if (spell_ob->flag [FLAG_IS_USED_UP] || tmp->flag [FLAG_IS_USED_UP])
693	{	692	{
694	tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);	693	tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
695	SET_FLAG (tmp, FLAG_IS_USED_UP);	694	tmp->set_flag (FLAG_IS_USED_UP);
696	}	695	}
697		696
698	if (QUERY_FLAG (spell_ob, FLAG_TEAR_DOWN))	697	if (spell_ob->flag [FLAG_TEAR_DOWN])
699	{	698	{
700	tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);	699	tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
701	tmp->stats.maxhp = tmp->stats.hp;	700	tmp->stats.maxhp = tmp->stats.hp;
702	SET_FLAG (tmp, FLAG_TEAR_DOWN);	701	tmp->set_flag (FLAG_TEAR_DOWN);
703	SET_FLAG (tmp, FLAG_ALIVE);	702	tmp->set_flag (FLAG_ALIVE);
704	}	703	}
705		704
706	/* This can't really hurt - if the object doesn't kill anything,	705	/* This can't really hurt - if the object doesn't kill anything,
707	* these fields just won't be used. Do not set the owner for	706	* these fields just won't be used. Do not set the owner for
708	* earthwalls, though, so they survive restarts.	707	* earthwalls, though, so they survive restarts.
709	*/	708	*/
710	if (tmp->type != EARTHWALL) //TODO	709	if (tmp->type != EARTHWALL) //TODO
711	tmp->set_owner (op);	710	tmp->set_owner (op);
712		711
713	set_spell_skill (op, caster, spell_ob, tmp);	712	set_spell_skill (op, caster, spell_ob, tmp);
714	tmp->level = caster_level (caster, spell_ob) / 2;	713	tmp->level = casting_level (caster, spell_ob) / 2;
715		714
716	name = tmp->name;	715	name = tmp->name;
717	if (!(tmp = m->insert (tmp, x, y, op)))	716	if (!(tmp = m->insert (tmp, x, y, op)))
718	{	717	{
719	new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name);	718	new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name);
720	return 0;	719	return 0;
721	}	720	}
722		721
723	/* If this is a spellcasting wall, need to insert the spell object */	722	/* If this is a spellcasting wall, need to insert the spell object */
724	if (tmp->other_arch && tmp->other_arch->type == SPELL)	723	if (tmp->other_arch && tmp->other_arch->type == SPELL)
725	insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp);	724	insert_ob_in_ob (tmp->other_arch->instance (), tmp);
726		725
727	/* This code causes the wall to extend some distance in	726	/* This code causes the wall to extend some distance in
728	* each direction, or until an obstruction is encountered.	727	* each direction, or until an obstruction is encountered.
729	* posblocked and negblocked help determine how far the	728	* posblocked and negblocked help determine how far the
730	* created wall can extend, it won't go extend through	729	* created wall can extend, it won't go extend through
…		…
750	object *tmp2 = tmp->clone ();	749	object *tmp2 = tmp->clone ();
751	m->insert (tmp2, x, y, op);	750	m->insert (tmp2, x, y, op);
752		751
753	/* If this is a spellcasting wall, need to insert the spell object */	752	/* If this is a spellcasting wall, need to insert the spell object */
754	if (tmp2->other_arch && tmp2->other_arch->type == SPELL)	753	if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
755	tmp2->insert (arch_to_object (tmp2->other_arch));	754	tmp2->insert (tmp2->other_arch->instance ());
756		755
757	}	756	}
758	else	757	else
759	posblocked = 1;	758	posblocked = 1;
760		759
…		…
767	{	766	{
768	object *tmp2 = tmp->clone ();	767	object *tmp2 = tmp->clone ();
769	m->insert (tmp2, x, y, op);	768	m->insert (tmp2, x, y, op);
770		769
771	if (tmp2->other_arch && tmp2->other_arch->type == SPELL)	770	if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
772	tmp2->insert (arch_to_object (tmp2->other_arch));	771	tmp2->insert (tmp2->other_arch->instance ());
773	}	772	}
774	else	773	else
775	negblocked = 1;	774	negblocked = 1;
776	}	775	}
777		776
778	if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW))	777	if (tmp->flag [FLAG_BLOCKSVIEW])
779	update_all_los (op->map, op->x, op->y);	778	update_all_los (op->map, op->x, op->y);
780		779
781	return 1;	780	return 1;
782	}	781	}
783		782
784	int	783	int
785	dimension_door (object *op, object *caster, object *spob, int dir)	784	dimension_door (object *op, object *caster, object *spob, int dir, const char *spellparam)
786	{	785	{
787	uint32 dist, maxdist;	786	uint32 dist, maxdist;
788	int mflags;	787	int mflags;
789	maptile *m;	788	maptile *m;
790	sint16 sx, sy;	789	sint16 sx, sy;
…		…
792	if (op->type != PLAYER)	791	if (op->type != PLAYER)
793	return 0;	792	return 0;
794		793
795	if (!dir)	794	if (!dir)
796	{	795	{
797	new_draw_info (NDI_UNIQUE, 0, op, "In what direction?");	796	op->failmsg ("In what direction?");
798	return 0;	797	return 0;
799	}	798	}
800		799
801	/* Given the new outdoor maps, can't let players dimension door for	800	/* Given the new outdoor maps, can't let players dimension door for
802	* ever, so put limits in.	801	* ever, so put limits in.
803	*/	802	*/
804	maxdist = spob->range + SP_level_range_adjust (caster, spob);	803	maxdist = spob->range + SP_level_range_adjust (caster, spob);
805		804
806	if (op->contr->count)	805	if (spellparam)
807	{	806	{
		807	int count = atoi (spellparam);
		808
808	if (op->contr->count > maxdist)	809	if (count > maxdist)
809	{	810	{
810	new_draw_info (NDI_UNIQUE, 0, op, "You can't dimension door that far!");	811	op->failmsg ("You can't dimension door that far!");
811	return 0;	812	return 0;
812	}	813	}
813		814
814	for (dist = 0; dist < op->contr->count; dist++)	815	for (dist = 0; dist < count; dist++)
815	{	816	{
816	mflags = get_map_flags (op->map, &m, op->x + freearr_x[dir] * (dist + 1), op->y + freearr_y[dir] * (dist + 1), &sx, &sy);	817	mflags = get_map_flags (op->map, &m, op->x + freearr_x[dir] * (dist + 1), op->y + freearr_y[dir] * (dist + 1), &sx, &sy);
817		818
818	if (mflags & (P_NO_MAGIC | P_OUT_OF_MAP))	819	if (mflags & (P_NO_MAGIC | P_OUT_OF_MAP))
819	break;	820	break;
820		821
821	if ((mflags & P_BLOCKSVIEW) && OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy)))	822	if ((mflags & P_BLOCKSVIEW) && OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy)))
822	break;	823	break;
823	}	824	}
824		825
825	if (dist < op->contr->count)	826	if (dist < count)
826	{	827	{
827	new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n");	828	new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n");
828	op->contr->count = 0;
829	return 0;	829	return 0;
830	}	830	}
831
832	op->contr->count = 0;
833		831
834	/* Remove code that puts player on random space on maps. IMO,	832	/* Remove code that puts player on random space on maps. IMO,
835	* a lot of maps probably have areas the player should not get to,	833	* a lot of maps probably have areas the player should not get to,
836	* but may not be marked as NO_MAGIC (as they may be bounded	834	* but may not be marked as NO_MAGIC (as they may be bounded
837	* by such squares). Also, there are probably treasure rooms and	835	* by such squares). Also, there are probably treasure rooms and
…		…
879	break;	877	break;
880		878
881	}	879	}
882	if (!dist)	880	if (!dist)
883	{	881	{
884	new_draw_info (NDI_UNIQUE, 0, op, "Your spell failed!\n");	882	op->failmsg ("Your spell failed!\n");
885	return 0;	883	return 0;
886	}	884	}
887	}	885	}
888		886
889	/* Actually move the player now */	887	/* Actually move the player now */
890	if (!(op = op->map->insert (op, op->x + freearr_x[dir] * dist, op->y + freearr_y[dir] * dist, op)))	888	if (!(op = op->map->insert (op, op->x + freearr_x[dir] * dist, op->y + freearr_y[dir] * dist, op)))
891	return 1;	889	return 1;
892		890
893	op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */	891	op->speed_left = -5. * op->speed; /* Freeze them for a short while */
		892
894	return 1;	893	return 1;
895	}	894	}
896		895
897	/* cast_heal: Heals something.	896	/* cast_heal: Heals something.
898	* op is the caster.	897	* op is the caster.
…		…
953	if (cure_disease (tmp, op, spell))	952	if (cure_disease (tmp, op, spell))
954	success = 1;	953	success = 1;
955		954
956	if (spell->attacktype & AT_POISON)	955	if (spell->attacktype & AT_POISON)
957	{	956	{
958	at = archetype::find ("poisoning");	957	at = archetype::find (shstr_poisoning);
959	poison = present_arch_in_ob (at, tmp);	958	poison = present_arch_in_ob (at, tmp);
960	if (poison)	959	if (poison)
961	{	960	{
962	success = 1;	961	success = 1;
963	new_draw_info (NDI_UNIQUE, 0, tmp, "Your body feels cleansed");	962	new_draw_info (NDI_UNIQUE, 0, tmp, "Your body feels cleansed");
…		…
965	}	964	}
966	}	965	}
967		966
968	if (spell->attacktype & AT_CONFUSION)	967	if (spell->attacktype & AT_CONFUSION)
969	{	968	{
970	poison = present_in_ob_by_name (FORCE, "confusion", tmp);	969	poison = present_in_ob_by_name (FORCE, shstr_confusion, tmp);
971	if (poison)	970	if (poison)
972	{	971	{
973	success = 1;	972	success = 1;
974	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	973	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
975	poison->duration = 1;	974	poison->duration = 1;
976	}	975	}
977	}	976	}
978		977
979	if (spell->attacktype & AT_BLIND)	978	if (spell->attacktype & AT_BLIND)
980	{	979	{
981	at = archetype::find ("blindness");	980	at = archetype::find (shstr_blindness);
982	poison = present_arch_in_ob (at, tmp);	981	poison = present_arch_in_ob (at, tmp);
983	if (poison)	982	if (poison)
984	{	983	{
985	success = 1;	984	success = 1;
986	new_draw_info (NDI_UNIQUE, 0, tmp, "Your vision begins to return.");	985	new_draw_info (NDI_UNIQUE, 0, tmp, "Your vision begins to return.");
…		…
1004	tmp->stats.grace = tmp->stats.maxgrace;	1003	tmp->stats.grace = tmp->stats.maxgrace;
1005	success = 1;	1004	success = 1;
1006	new_draw_info (NDI_UNIQUE, 0, tmp, "You feel redeemed with your god!");	1005	new_draw_info (NDI_UNIQUE, 0, tmp, "You feel redeemed with your god!");
1007	}	1006	}
1008		1007
1009	if (spell->stats.food && tmp->stats.food < 999)	1008	if (spell->stats.food && tmp->stats.food < MAX_FOOD)
1010	{	1009	{
1011	tmp->stats.food += spell->stats.food;	1010	tmp->stats.food += spell->stats.food;
1012		1011	min_it (tmp->stats.food, MAX_FOOD);
1013	if (tmp->stats.food > 999)
1014	tmp->stats.food = 999;
1015		1012
1016	success = 1;	1013	success = 1;
1017	/* We could do something a bit better like the messages for healing above */	1014	/* We could do something a bit better like the messages for healing above */
1018	new_draw_info (NDI_UNIQUE, 0, tmp, "You feel your belly fill with food");	1015	new_draw_info (NDI_UNIQUE, 0, tmp, "You feel your belly fill with food");
1019	}	1016	}
…		…
1034	"You don't feel any more powerful."	1031	"You don't feel any more powerful."
1035	"You are no easier to look at.",	1032	"You are no easier to look at.",
1036	};	1033	};
1037		1034
1038	int	1035	int
		1036	change_ability_duration (object *spell, object *caster)
		1037	{
		1038	return spell->duration + SP_level_duration_adjust (caster, spell) * 50;
		1039	}
		1040
		1041	int
1039	cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent)	1042	cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent)
1040	{	1043	{
1041	object *force = NULL;	1044	object *force = 0;
1042	int i;	1045	int i;
1043		1046
1044	/* if dir = 99 op defaults to tmp, eat_special_food() requires this. */	1047	/* if dir = 99 op defaults to tmp, eat_special_food() requires this. */
1045	object *tmp = dir	1048	object *tmp = dir
1046	? find_target_for_friendly_spell (op, dir)	1049	? find_target_for_friendly_spell (op, dir)
1047	: op;	1050	: op;
1048		1051
1049	if (!tmp)	1052	if (!tmp)
1050	return 0;	1053	return 0;
1051		1054
1052	/* If we've already got a force of this type, don't add a new one. */	1055	/* If we've already got a force of this type, don't add a new one. */
…		…
1060	break;	1063	break;
1061	}	1064	}
1062	else if (spell_ob->race && spell_ob->race == tmp2->name)	1065	else if (spell_ob->race && spell_ob->race == tmp2->name)
1063	{	1066	{
1064	if (!silent)	1067	if (!silent)
1065	new_draw_info_format (NDI_UNIQUE, 0, op, "You can not cast %s while %s is in effect", &spell_ob->name, &tmp2->name_pl);	1068	op->failmsgf ("You can not cast %s while %s is in effect",
		1069	&spell_ob->name, &tmp2->name_pl);
		1070
1066	return 0;	1071	return 0;
1067	}	1072	}
1068	}	1073	}
1069	}	1074	}
		1075
		1076	int duration = change_ability_duration (spell_ob, caster);
		1077
1070	if (force == NULL)	1078	if (force)
1071	{
1072	force = get_archetype (FORCE_NAME);
1073	force->subtype = FORCE_CHANGE_ABILITY;
1074	if (spell_ob->race)
1075	force->name = spell_ob->race;
1076	else
1077	force->name = spell_ob->name;
1078	force->name_pl = spell_ob->name;
1079	new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force.");
1080
1081	}	1079	{
1082	else
1083	{
1084	int duration;
1085
1086	duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1087	if (duration > force->duration)	1080	if (duration > force->duration)
1088	{	1081	{
1089	force->duration = duration;	1082	force->duration = duration;
1090	new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");	1083	new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
1091	}	1084	}
1092	else	1085	else
1093	{
1094	new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");	1086	new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1095	}
1096		1087
1097	return 1;	1088	return 1;
1098	}	1089	}
1099		1090
1100	force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;	1091	new_draw_info_format (NDI_UNIQUE, 0, op,
		1092	"You create an aura of magical force. H<The effect will last for about %.10g seconds.>",
		1093	TICK2TIME (duration));
		1094
		1095	force = get_archetype (FORCE_NAME);
		1096	force->subtype = FORCE_CHANGE_ABILITY;
		1097	force->duration = duration;
		1098
		1099	if (spell_ob->race)
		1100	force->name = spell_ob->race;
		1101	else
		1102	force->name = spell_ob->name;
		1103
		1104	force->name_pl = spell_ob->name;
		1105
1101	force->speed = 1.0;	1106	force->speed = 1.0;
1102	force->speed_left = -1.0;	1107	force->speed_left = -1.0;
1103	SET_FLAG (force, FLAG_APPLIED);	1108	force->set_flag (FLAG_APPLIED);
1104		1109
1105	/* Now start processing the effects. First, protections */	1110	/* Now start processing the effects. First, protections */
1106	for (i = 0; i < NROFATTACKS; i++)	1111	for (i = 0; i < NROFATTACKS; i++)
1107	{	1112	{
1108	if (spell_ob->resist[i])	1113	if (spell_ob->resist[i])
…		…
1138	}	1143	}
1139	}	1144	}
1140		1145
1141	force->move_type = spell_ob->move_type;	1146	force->move_type = spell_ob->move_type;
1142		1147
1143	if (QUERY_FLAG (spell_ob, FLAG_SEE_IN_DARK))	1148	if (spell_ob->flag [FLAG_SEE_IN_DARK])
1144	SET_FLAG (force, FLAG_SEE_IN_DARK);	1149	force->set_flag (FLAG_SEE_IN_DARK);
1145		1150
1146	if (QUERY_FLAG (spell_ob, FLAG_XRAYS))	1151	if (spell_ob->flag [FLAG_XRAYS])
1147	SET_FLAG (force, FLAG_XRAYS);	1152	force->set_flag (FLAG_XRAYS);
1148		1153
1149	/* Haste/bonus speed */	1154	/* Haste/bonus speed */
1150	if (spell_ob->stats.exp)	1155	if (spell_ob->stats.exp)
1151	{	1156	{
1152	if (op->speed > 0.5f)	1157	if (op->speed > 0.5f)
…		…
1233	return 0;	1238	return 0;
1234	}	1239	}
1235	force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;	1240	force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1236	force->speed = 1.0;	1241	force->speed = 1.0;
1237	force->speed_left = -1.0;	1242	force->speed_left = -1.0;
1238	SET_FLAG (force, FLAG_APPLIED);	1243	force->set_flag (FLAG_APPLIED);
1239		1244
1240	if (!god)	1245	if (!god)
1241	{	1246	{
1242	new_draw_info (NDI_UNIQUE, 0, op, "Your blessing seems empty.");	1247	new_draw_info (NDI_UNIQUE, 0, op, "Your blessing seems empty.");
1243	}	1248	}
1244	else	1249	else
1245	{	1250	{
1246	/* Only give out good benefits, and put a max on it */	1251	/* Only give out good benefits, and put a max on it */
1247	for (i = 0; i < NROFATTACKS; i++)	1252	for (i = 0; i < NROFATTACKS; i++)
1248	{
1249	if (god->resist[i] > 0)	1253	if (god->resist[i] > 0)
1250	{
1251	force->resist[i] = MIN (god->resist[i], spell_ob->resist[ATNR_GODPOWER]);	1254	force->resist[i] = min (god->resist[i], spell_ob->resist[ATNR_GODPOWER]);
1252	}	1255
1253	}
1254	force->path_attuned |= god->path_attuned;	1256	force->path_attuned |= god->path_attuned;
1255		1257
1256	if (spell_ob->attacktype)	1258	if (spell_ob->attacktype)
1257	force->slaying = god->slaying;	1259	force->slaying = god->slaying;
1258		1260
…		…
1300	* the nuggets, alchemy the gold from that, etc.	1302	* the nuggets, alchemy the gold from that, etc.
1301	* Otherwise, give 9 silver on the gold for other objects,	1303	* Otherwise, give 9 silver on the gold for other objects,
1302	* so that it would still be more affordable to haul	1304	* so that it would still be more affordable to haul
1303	* the stuff back to town.	1305	* the stuff back to town.
1304	*/	1306	*/
1305	if (QUERY_FLAG (obj, FLAG_UNPAID))	1307	if (obj->flag [FLAG_UNPAID])
1306	value = 0;	1308	value = 0;
1307	else if (obj->type == MONEY || obj->type == GEM)	1309	else if (obj->type == MONEY || obj->type == GEM)
1308	value /= 3;	1310	value /= 3;
1309	else	1311	else
1310	value = value * 9 / 10;	1312	value = value * 9 / 10;
…		…
1323	if (op->type != PLAYER)	1325	if (op->type != PLAYER)
1324	return 0;	1326	return 0;
1325		1327
1326	archetype *nugget[3];	1328	archetype *nugget[3];
1327		1329
1328	nugget[0] = archetype::find ("pyrite3");	1330	nugget[0] = archetype::find (shstr_pyrite3);
1329	nugget[1] = archetype::find ("pyrite2");	1331	nugget[1] = archetype::find (shstr_pyrite2);
1330	nugget[2] = archetype::find ("pyrite");	1332	nugget[2] = archetype::find (shstr_pyrite);
1331		1333
1332	/* Put a maximum weight of items that can be alchemised. Limits the power	1334	/* Put a maximum weight of items that can be alchemised. Limits the power
1333	* some, and also prevents people from alchemising every table/chair/clock	1335	* some, and also prevents people from alchemising every table/chair/clock
1334	* in sight	1336	* in sight
1335	*/	1337	*/
…		…
1364		1366
1365	for (object *next, *tmp = mp->at (nx, ny).bot; tmp; tmp = next)	1367	for (object *next, *tmp = mp->at (nx, ny).bot; tmp; tmp = next)
1366	{	1368	{
1367	next = tmp->above;	1369	next = tmp->above;
1368		1370
1369	if (tmp->weight > 0 && !QUERY_FLAG (tmp, FLAG_NO_PICK) &&	1371	if (tmp->weight > 0 && !tmp->flag [FLAG_NO_PICK] &&
1370	!QUERY_FLAG (tmp, FLAG_ALIVE) && !QUERY_FLAG (tmp, FLAG_IS_CAULDRON))	1372	!tmp->flag [FLAG_ALIVE] && !tmp->flag [FLAG_IS_CAULDRON])
1371	{	1373	{
1372	if (tmp->inv)	1374	if (tmp->inv)
1373	{	1375	{
1374	object *next1, *tmp1;	1376	object *next1, *tmp1;
1375		1377
1376	for (tmp1 = tmp->inv; tmp1; tmp1 = next1)	1378	for (tmp1 = tmp->inv; tmp1; tmp1 = next1)
1377	{	1379	{
1378	next1 = tmp1->below;	1380	next1 = tmp1->below;
1379	if (tmp1->weight > 0 && !QUERY_FLAG (tmp1, FLAG_NO_PICK) &&	1381	if (tmp1->weight > 0 && !tmp1->flag [FLAG_NO_PICK] &&
1380	!QUERY_FLAG (tmp1, FLAG_ALIVE) && !QUERY_FLAG (tmp1, FLAG_IS_CAULDRON))	1382	!tmp1->flag [FLAG_ALIVE] && !tmp1->flag [FLAG_IS_CAULDRON])
1381	alchemy_object (tmp1, value, weight);	1383	alchemy_object (tmp1, value, weight);
1382	}	1384	}
1383	}	1385	}
1384		1386
1385	alchemy_object (tmp, value, weight);	1387	alchemy_object (tmp, value, weight);
…		…
1395	for (int i = 0; i < sizeof (nugget) / sizeof (nugget [0]); ++i)	1397	for (int i = 0; i < sizeof (nugget) / sizeof (nugget [0]); ++i)
1396	if (int nrof = value / nugget [i]->value)	1398	if (int nrof = value / nugget [i]->value)
1397	{	1399	{
1398	value -= nrof * nugget[i]->value;	1400	value -= nrof * nugget[i]->value;
1399		1401
1400	object *tmp = arch_to_object (nugget[i]);	1402	object *tmp = nugget[i]->instance ();
1401	tmp->nrof = nrof;	1403	tmp->nrof = nrof;
1402	tmp->flag [FLAG_IDENTIFIED] = true;	1404	tmp->flag [FLAG_IDENTIFIED] = true;
1403	op->map->insert (tmp, x, y, op, 0);	1405	op->map->insert (tmp, x, y, op, 0);
1404	}	1406	}
1405		1407
…		…
1416	* items.	1418	* items.
1417	*/	1419	*/
1418	int	1420	int
1419	remove_curse (object *op, object *caster, object *spell)	1421	remove_curse (object *op, object *caster, object *spell)
1420	{	1422	{
1421	object *tmp;
1422	int success = 0, was_one = 0;	1423	int success = 0, was_one = 0;
1423		1424
1424	for (tmp = op->inv; tmp; tmp = tmp->below)	1425	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1425	if (QUERY_FLAG (tmp, FLAG_APPLIED) &&	1426	if (tmp->flag [FLAG_APPLIED] &&
1426	((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) ||	1427	((tmp->flag [FLAG_CURSED] && spell->flag [FLAG_CURSED]) ||
1427	(QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED))))	1428	(tmp->flag [FLAG_DAMNED] && spell->flag [FLAG_DAMNED])))
1428	{	1429	{
1429	was_one++;	1430	was_one++;
1430		1431
1431	if (tmp->level <= caster_level (caster, spell))	1432	if (tmp->level <= casting_level (caster, spell))
1432	{	1433	{
1433	success++;	1434	success++;
1434	if (QUERY_FLAG (spell, FLAG_DAMNED))	1435	if (spell->flag [FLAG_DAMNED])
1435	CLEAR_FLAG (tmp, FLAG_DAMNED);	1436	tmp->clr_flag (FLAG_DAMNED);
1436		1437
1437	CLEAR_FLAG (tmp, FLAG_CURSED);	1438	tmp->clr_flag (FLAG_CURSED);
1438	CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED);	1439	tmp->clr_flag (FLAG_KNOWN_CURSED);
1439	tmp->value = 0; /* Still can't sell it */	1440	tmp->value = 0; /* Still can't sell it */
1440		1441
1441	if (object *pl = tmp->visible_to ())	1442	if (object *pl = tmp->visible_to ())
1442	esrv_update_item (UPD_FLAGS, pl, tmp);	1443	esrv_update_item (UPD_FLAGS, pl, tmp);
1443	}	1444	}
…		…
1461		1462
1462	/* Identifies objects in the players inventory/on the ground */	1463	/* Identifies objects in the players inventory/on the ground */
1463	int	1464	int
1464	cast_identify (object *op, object *caster, object *spell)	1465	cast_identify (object *op, object *caster, object *spell)
1465	{	1466	{
1466	dynbuf_text buf;
1467	object *tmp;	1467	object *tmp;
		1468	dynbuf_text &buf = msg_dynbuf; buf.clear ();
1468		1469
1469	int num_ident = spell->stats.dam + SP_level_dam_adjust (caster, spell);	1470	int num_ident = max (1, spell->stats.dam + SP_level_dam_adjust (caster, spell));
1470
1471	if (num_ident < 1)
1472	num_ident = 1;
1473		1471
1474	for (tmp = op->inv; tmp; tmp = tmp->below)	1472	for (tmp = op->inv; tmp; tmp = tmp->below)
1475	{	1473	{
1476	if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))	1474	if (!tmp->flag [FLAG_IDENTIFIED] && !tmp->invisible && need_identify (tmp))
1477	{	1475	{
1478	identify (tmp);	1476	identify (tmp);
1479		1477
1480	if (op->type == PLAYER)	1478	if (op->type == PLAYER)
1481	{	1479	{
1482	buf.printf ("You identified: %s.\n\n", long_desc (tmp, op));	1480	buf.printf ("You identified: %s.\r", long_desc (tmp, op));
1483		1481
1484	if (tmp->msg)	1482	if (tmp->msg)
1485	buf << "The item has a story:\n\n" << tmp->msg << "\n\n";	1483	buf << "The item has a story:\r" << tmp->msg << "\n\n";
1486	}	1484	}
1487		1485
1488	num_ident--;
1489	if (!num_ident)	1486	if (!--num_ident)
1490	break;	1487	break;
1491	}	1488	}
1492	}	1489	}
1493		1490
1494	/* If all the power of the spell has been used up, don't go and identify	1491	/* If all the power of the spell has been used up, don't go and identify
…		…
1496	* was not fully used.	1493	* was not fully used.
1497	*/	1494	*/
1498	if (num_ident)	1495	if (num_ident)
1499	{	1496	{
1500	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)	1497	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
1501	if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))	1498	if (!tmp->flag [FLAG_IDENTIFIED] && !tmp->invisible && need_identify (tmp))
1502	{	1499	{
1503	identify (tmp);	1500	identify (tmp);
1504		1501
1505	if (object *pl = tmp->visible_to ())	1502	if (object *pl = tmp->visible_to ())
1506	{	1503	{
1507	buf.printf ("On the ground you identified: %s.\n\n", long_desc (tmp, op));	1504	buf.printf ("On the ground you identified: %s.\r", long_desc (tmp, op));
1508		1505
1509	if (tmp->msg)	1506	if (tmp->msg)
1510	buf << "The item has a story:\n\n" << tmp->msg << "\n\n";	1507	buf << "The item has a story:\r" << tmp->msg << "\n\n";
1511	}	1508	}
1512		1509
1513	num_ident--;
1514	if (!num_ident)	1510	if (!--num_ident)
1515	break;	1511	break;
1516	}	1512	}
1517	}	1513	}
1518		1514
1519	if (buf.empty ())	1515	if (buf.empty ())
…		…
1541		1537
1542	/* We precompute some values here so that we don't have to keep	1538	/* We precompute some values here so that we don't have to keep
1543	* doing it over and over again.	1539	* doing it over and over again.
1544	*/	1540	*/
1545	god = find_god (determine_god (op));	1541	god = find_god (determine_god (op));
1546	level = caster_level (caster, spell);	1542	level = casting_level (caster, spell);
1547	range = spell->range + SP_level_range_adjust (caster, spell);	1543	range = spell->range + SP_level_range_adjust (caster, spell);
1548		1544
1549	if (!skill)	1545	if (!skill)
1550	skill = caster;	1546	skill = caster;
1551		1547
1552	for (x = op->x - range; x <= op->x + range; x++)	1548	dynbuf buf;
1553	for (y = op->y - range; y <= op->y + range; y++)	1549	unordered_mapwalk (buf, op, -range, -range, range, range)
1554	{	1550	{
1555	m = op->map;
1556	mflags = get_map_flags (m, &m, x, y, &nx, &ny);
1557	if (mflags & P_OUT_OF_MAP)
1558	continue;
1559
1560	/* For most of the detections, we only detect objects above the	1551	/* For most of the detections, we only detect objects above the
1561	* floor. But this is not true for show invisible.	1552	* floor. But this is not true for show invisible.
1562	* Basically, we just go and find the top object and work	1553	* Basically, we just go and find the top object and work
1563	* down - that is easier than working up.	1554	* down - that is easier than working up.
1564	*/	1555	*/
1565		1556
1566	for (last = NULL, tmp = GET_MAP_OB (m, nx, ny); tmp; tmp = tmp->above)	1557	for (last = 0, tmp = m->at (nx, ny).bot; tmp; tmp = tmp->above)
1567	last = tmp;	1558	last = tmp;
1568		1559
1569	/* Shouldn't happen, but if there are no objects on a space, this	1560	/* Shouldn't happen, but if there are no objects on a space, this
1570	* would happen.	1561	* would happen.
1571	*/	1562	*/
1572	if (!last)	1563	if (!last)
1573	continue;	1564	continue;
1574		1565
1575	done_one = 0;	1566	done_one = 0;
1576	floor = 0;	1567	floor = 0;
1577	detect = NULL;	1568	detect = 0;
1578	for (tmp = last; tmp; tmp = tmp->below)	1569	for (tmp = last; tmp; tmp = tmp->below)
1579	{	1570	{
1580	/* show invisible */	1571	/* show invisible */
1581	if (QUERY_FLAG (spell, FLAG_MAKE_INVIS) &&	1572	if (spell->flag [FLAG_MAKE_INVIS]
1582	/* Might there be other objects that we can make visible? */	1573	/* Might there be other objects that we can make visible? */
1583	(tmp->invisible && (QUERY_FLAG (tmp, FLAG_MONSTER) ||	1574	&& (tmp->invisible && (tmp->flag [FLAG_MONSTER]
1584	(tmp->type == PLAYER && !QUERY_FLAG (tmp, FLAG_WIZ)) ||	1575	|| (tmp->type == PLAYER && !tmp->flag [FLAG_WIZ])
1585	tmp->type == CF_HANDLE ||	1576	|| tmp->type == T_HANDLE
1586	tmp->type == TRAPDOOR || tmp->type == EXIT || tmp->type == HOLE ||	1577	|| tmp->type == TRAPDOOR
		1578	|| tmp->type == EXIT
		1579	|| tmp->type == HOLE
		1580	|| tmp->type == BUTTON
1587	tmp->type == BUTTON || tmp->type == TELEPORTER ||	1581	|| tmp->type == TELEPORTER
		1582	|| tmp->type == GATE
1588	tmp->type == GATE || tmp->type == LOCKED_DOOR ||	1583	|| tmp->type == LOCKED_DOOR
1589	tmp->type == WEAPON || tmp->type == ALTAR || tmp->type == SIGN ||	1584	|| tmp->type == WEAPON
		1585	|| tmp->type == ALTAR
		1586	|| (tmp->type == SIGN && tmp->face != magicmouth_face)
1590	tmp->type == TRIGGER_PEDESTAL || tmp->type == SPECIAL_KEY ||	1587	|| tmp->type == TRIGGER_PEDESTAL
1591	tmp->type == TREASURE || tmp->type == BOOK || tmp->type == HOLY_ALTAR)))	1588	|| tmp->type == SPECIAL_KEY
		1589	|| tmp->type == TREASURE
		1590	|| tmp->type == BOOK
		1591	|| tmp->type == HOLY_ALTAR
		1592	|| tmp->type == CONTAINER)))
1592	{	1593	{
		1594	printf ("show inv %s\n", tmp->debug_desc());//D
1593	if (random_roll (0, skill->level - 1, op, PREFER_HIGH) > level / 4)	1595	if (random_roll (0, skill->level - 1, op, PREFER_HIGH) > level / 4)
1594	{	1596	{
1595	tmp->invisible = 0;	1597	tmp->invisible = 0;
		1598	done_one = 1;
		1599	}
		1600	}
		1601
		1602	if (tmp->flag [FLAG_IS_FLOOR])
		1603	floor = 1;
		1604
		1605	/* All detections below this point don't descend beneath the floor,
		1606	* so just continue on. We could be clever and look at the type of
		1607	* detection to completely break out if we don't care about objects beneath
		1608	* the floor, but once we get to the floor, not likely a very big issue anyways.
		1609	*/
		1610	if (floor)
		1611	continue;
		1612
		1613	/* I had thought about making detect magic and detect curse
		1614	* show the flash the magic item like it does for detect monster.
		1615	* however, if the object is within sight, this would then make it
		1616	* difficult to see what object is magical/cursed, so the
		1617	* effect wouldn't be as apparent.
		1618	*/
		1619
		1620	/* detect magic */
		1621	if (spell->flag [FLAG_KNOWN_MAGICAL] &&
		1622	!tmp->flag [FLAG_KNOWN_MAGICAL] && !tmp->flag [FLAG_IDENTIFIED] && is_magical (tmp))
		1623	{
		1624	tmp->set_flag (FLAG_KNOWN_MAGICAL);
		1625	/* make runes more visible */
		1626	if (tmp->type == RUNE && tmp->attacktype & AT_MAGIC)
		1627	tmp->stats.Cha /= 4;
		1628
		1629	done_one = 1;
		1630	}
		1631
		1632	/* detect monster */
		1633	if (spell->flag [FLAG_MONSTER] && (tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER))
		1634	{
		1635	done_one = 2;
		1636
		1637	if (!detect)
		1638	detect = tmp;
		1639	}
		1640
		1641	/* Basically, if race is set in the spell, then the creatures race must
		1642	* match that. if the spell race is set to GOD, then the gods opposing
		1643	* race must match.
		1644	*/
		1645	if (spell->race && tmp->flag [FLAG_MONSTER] && tmp->race &&
		1646	((spell->race == shstr_GOD && god && god->slaying.contains (tmp->race)) ||
		1647	spell->race.contains (tmp->race)))
		1648	{
		1649	done_one = 2;
		1650
		1651	if (!detect)
		1652	detect = tmp;
		1653	}
		1654
		1655	if (spell->flag [FLAG_KNOWN_CURSED] && !tmp->flag [FLAG_KNOWN_CURSED] &&
		1656	(tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED]))
		1657	{
		1658	tmp->set_flag (FLAG_KNOWN_CURSED);
		1659	done_one = 1;
		1660	}
		1661
		1662	// Do mining detection spell:
		1663	if (spell->last_sp == 1) // 1 - detect any vein
		1664	{
		1665	if (tmp->type == VEIN)
		1666	{
		1667	if (tmp->other_arch)
		1668	{
		1669	if (!detect)
		1670	detect = tmp->other_arch;
		1671	done_one = 2;
		1672	}
		1673	else
1596	done_one = 1;	1674	done_one = 1;
1597	}	1675	}
1598	}	1676	}
1599
1600	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1601	floor = 1;
1602
1603	/* All detections below this point don't descend beneath the floor,
1604	* so just continue on. We could be clever and look at the type of
1605	* detection to completely break out if we don't care about objects beneath
1606	* the floor, but once we get to the floor, not likely a very big issue anyways.
1607	*/
1608	if (floor)
1609	continue;
1610
1611	/* I had thought about making detect magic and detect curse
1612	* show the flash the magic item like it does for detect monster.
1613	* however, if the object is within sight, this would then make it
1614	* difficult to see what object is magical/cursed, so the
1615	* effect wouldn't be as apparant.
1616	*/
1617
1618	/* detect magic */
1619	if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) &&
1620	!QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && is_magical (tmp))
1621	{
1622	SET_FLAG (tmp, FLAG_KNOWN_MAGICAL);
1623	/* make runes more visibile */
1624	if (tmp->type == RUNE && tmp->attacktype & AT_MAGIC)
1625	tmp->stats.Cha /= 4;
1626	done_one = 1;
1627	}
1628	/* detect monster */
1629	if (QUERY_FLAG (spell, FLAG_MONSTER) && (QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER))
1630	{
1631	done_one = 2;
1632	if (!detect)
1633	detect = tmp;
1634	}
1635	/* Basically, if race is set in the spell, then the creatures race must
1636	* match that. if the spell race is set to GOD, then the gods opposing
1637	* race must match.
1638	*/
1639	if (spell->race && QUERY_FLAG (tmp, FLAG_MONSTER) && tmp->race &&
1640	((!strcmp (spell->race, "GOD") && god && god->slaying && strstr (god->slaying, tmp->race)) ||
1641	(strstr (spell->race, tmp->race))))
1642	{
1643	done_one = 2;
1644	if (!detect)
1645	detect = tmp;
1646	}
1647	if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) &&
1648	(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))
1649	{
1650	SET_FLAG (tmp, FLAG_KNOWN_CURSED);
1651	done_one = 1;
1652	}
1653	} /* for stack of objects on this space */	1677	} /* for stack of objects on this space */
1654		1678
1655	/* Code here puts an effect of the spell on the space, so you can see	1679	/* Code here puts an effect of the spell on the space, so you can see
1656	* where the magic is.	1680	* where the magic is.
1657	*/	1681	*/
1658	if (done_one)	1682	if (done_one)
1659	{	1683	{
1660	object *detect_ob = arch_to_object (spell->other_arch);	1684	object *detect_ob = spell->other_arch->instance ();
1661		1685
1662	/* if this is set, we want to copy the face */	1686	/* if this is set, we want to copy the face */
1663	if (done_one == 2 && detect)	1687	if (done_one == 2 && detect)
1664	{	1688	{
1665	detect_ob->face = detect->face;	1689	detect_ob->face = detect->face;
1666	detect_ob->animation_id = detect->animation_id;	1690	detect_ob->animation_id = detect->animation_id;
1667	detect_ob->anim_speed = detect->anim_speed;	1691	detect_ob->anim_speed = detect->anim_speed;
1668	detect_ob->last_anim = 0;	1692	detect_ob->last_anim = 0;
1669	/* by default, the detect_ob is already animated */	1693	/* by default, the detect_ob is already animated */
1670	if (!QUERY_FLAG (detect, FLAG_ANIMATE))	1694	if (!detect->flag [FLAG_ANIMATE])
1671	CLEAR_FLAG (detect_ob, FLAG_ANIMATE);	1695	detect_ob->clr_flag (FLAG_ANIMATE);
1672	}	1696	}
1673		1697
1674	m->insert (detect_ob, nx, ny, op);	1698	m->insert (detect_ob, nx, ny, op, INS_ON_TOP);
1675	}	1699	}
1676	} /* for processing the surrounding spaces */	1700	} /* for processing the surrounding spaces */
1677		1701
1678		1702
1679	/* Now process objects in the players inventory if detect curse or magic */	1703	/* Now process objects in the players inventory if detect curse or magic */
1680	if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) || QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL))	1704	if (spell->flag [FLAG_KNOWN_CURSED] || spell->flag [FLAG_KNOWN_MAGICAL])
1681	{	1705	{
1682	done_one = 0;	1706	done_one = 0;
1683		1707
1684	for (tmp = op->inv; tmp; tmp = tmp->below)	1708	for (tmp = op->inv; tmp; tmp = tmp->below)
1685	{	1709	{
1686	if (!tmp->invisible && !QUERY_FLAG (tmp, FLAG_IDENTIFIED))	1710	if (!tmp->invisible && !tmp->flag [FLAG_IDENTIFIED])
1687	{	1711	{
1688	if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) && is_magical (tmp) && !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL))	1712	if (spell->flag [FLAG_KNOWN_MAGICAL] && is_magical (tmp) && !tmp->flag [FLAG_KNOWN_MAGICAL])
1689	{	1713	{
1690	SET_FLAG (tmp, FLAG_KNOWN_MAGICAL);	1714	tmp->set_flag (FLAG_KNOWN_MAGICAL);
1691		1715
1692	if (object *pl = tmp->visible_to ())	1716	if (object *pl = tmp->visible_to ())
1693	esrv_update_item (UPD_FLAGS, pl, tmp);	1717	esrv_update_item (UPD_FLAGS, pl, tmp);
1694	}	1718	}
1695		1719
1696	if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) &&	1720	if (spell->flag [FLAG_KNOWN_CURSED] && !tmp->flag [FLAG_KNOWN_CURSED] &&
1697	(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))	1721	(tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED]))
1698	{	1722	{
1699	SET_FLAG (tmp, FLAG_KNOWN_CURSED);	1723	tmp->set_flag (FLAG_KNOWN_CURSED);
1700		1724
1701	if (object *pl = tmp->visible_to ())	1725	if (object *pl = tmp->visible_to ())
1702	esrv_update_item (UPD_FLAGS, pl, tmp);	1726	esrv_update_item (UPD_FLAGS, pl, tmp);
1703	}	1727	}
1704	} /* if item is not identified */	1728	} /* if item is not identified */
…		…
1725		1749
1726	new_draw_info (NDI_UNIQUE, 0, victim, "You feel energy course through you.");	1750	new_draw_info (NDI_UNIQUE, 0, victim, "You feel energy course through you.");
1727		1751
1728	if (victim->stats.sp >= victim->stats.maxsp * 2)	1752	if (victim->stats.sp >= victim->stats.maxsp * 2)
1729	{	1753	{
1730	object *tmp;
1731
1732	new_draw_info (NDI_UNIQUE, 0, victim, "Your head explodes!");	1754	new_draw_info (NDI_UNIQUE, 0, victim, "Your head explodes!");
1733
1734	/* Explodes a fireball centered at player */
1735	tmp = get_archetype (EXPLODING_FIREBALL);
1736	tmp->dam_modifier = random_roll (1, caster_level, victim, PREFER_LOW) / 5 + 1;
1737	tmp->stats.maxhp = random_roll (1, caster_level, victim, PREFER_LOW) / 10 + 2;
1738
1739	tmp->insert_at (victim);
1740	victim->stats.sp = 2 * victim->stats.maxsp;	1755	victim->stats.sp = 2 * victim->stats.maxsp;
		1756	create_exploding_ball_at (victim, caster_level);
1741	}	1757	}
1742	else if (victim->stats.sp >= victim->stats.maxsp * 1.88)	1758	else if (victim->stats.sp >= victim->stats.maxsp * 1.88)
1743	new_draw_info (NDI_UNIQUE, NDI_ORANGE, victim, "You feel like your head is going to explode.");	1759	new_draw_info (NDI_UNIQUE | NDI_ORANGE, 0, victim, "You feel like your head is going to explode.");
1744	else if (victim->stats.sp >= victim->stats.maxsp * 1.66)	1760	else if (victim->stats.sp >= victim->stats.maxsp * 1.66)
1745	new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!");	1761	new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!");
1746	else if (victim->stats.sp >= victim->stats.maxsp * 1.5)	1762	else if (victim->stats.sp >= victim->stats.maxsp * 1.5)
1747	{	1763	{
1748	new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world.");	1764	new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world.");
…		…
1772	mflags = get_map_flags (m, &m, x, y, &x, &y);	1788	mflags = get_map_flags (m, &m, x, y, &x, &y);
1773		1789
1774	if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE)	1790	if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE)
1775	{	1791	{
1776	for (plyr = GET_MAP_OB (m, x, y); plyr != NULL; plyr = plyr->above)	1792	for (plyr = GET_MAP_OB (m, x, y); plyr != NULL; plyr = plyr->above)
1777	if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE))	1793	if (plyr != op && plyr->flag [FLAG_ALIVE])
1778	break;	1794	break;
1779	}	1795	}
1780		1796
1781		1797
1782	/* If we did not find a player in the specified direction, transfer	1798	/* If we did not find a player in the specified direction, transfer
1783	* to anyone on top of us. This is used for the rune of transference mostly.	1799	* to anyone on top of us. This is used for the rune of transference mostly.
1784	*/	1800	*/
1785	if (plyr == NULL)	1801	if (plyr == NULL)
1786	for (plyr = GET_MAP_OB (op->map, op->x, op->y); plyr != NULL; plyr = plyr->above)	1802	for (plyr = GET_MAP_OB (op->map, op->x, op->y); plyr != NULL; plyr = plyr->above)
1787	if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE))	1803	if (plyr != op && plyr->flag [FLAG_ALIVE])
1788	break;	1804	break;
1789		1805
1790	if (!plyr)	1806	if (!plyr)
1791	{	1807	{
1792	new_draw_info (NDI_BLACK, 0, op, "There is no one there.");	1808	op->failmsg ("There is no one there.");
1793	return 0;	1809	return 0;
1794	}	1810	}
1795	/* give sp */	1811	/* give sp */
1796	if (spell->stats.dam > 0)	1812	if (spell->stats.dam > 0)
1797	{	1813	{
1798	plyr->stats.sp += spell->stats.dam + SP_level_dam_adjust (caster, spell);	1814	plyr->stats.sp += spell->stats.dam + SP_level_dam_adjust (caster, spell);
1799	charge_mana_effect (plyr, caster_level (caster, spell));	1815	charge_mana_effect (plyr, casting_level (caster, spell));
1800	return 1;	1816	return 1;
1801	}	1817	}
1802	/* suck sp away. Can't suck sp from yourself */	1818	/* suck sp away. Can't suck sp from yourself */
1803	else if (op != plyr)	1819	else if (op != plyr)
1804	{	1820	{
…		…
1809	if (rate > 95)	1825	if (rate > 95)
1810	rate = 95;	1826	rate = 95;
1811		1827
1812	sucked = (plyr->stats.sp * rate) / 100;	1828	sucked = (plyr->stats.sp * rate) / 100;
1813	plyr->stats.sp -= sucked;	1829	plyr->stats.sp -= sucked;
1814	if (QUERY_FLAG (op, FLAG_ALIVE))	1830	if (op->flag [FLAG_ALIVE])
1815	{	1831	{
1816	/* Player doesn't get full credit */	1832	/* Player doesn't get full credit */
1817	sucked = (sucked * rate) / 100;	1833	sucked = (sucked * rate) / 100;
1818	op->stats.sp += sucked;	1834	op->stats.sp += sucked;
1819	if (sucked > 0)	1835	if (sucked > 0)
1820	{	1836	{
1821	charge_mana_effect (op, caster_level (caster, spell));	1837	charge_mana_effect (op, casting_level (caster, spell));
1822	}	1838	}
1823	}	1839	}
1824	return 1;	1840	return 1;
1825	}	1841	}
1826	return 0;	1842	return 0;
…		…
1870	* monsters either.	1886	* monsters either.
1871	*/	1887	*/
1872		1888
1873	if (head->attacktype & AT_MAGIC	1889	if (head->attacktype & AT_MAGIC
1874	&& !(head->attacktype & AT_COUNTERSPELL)	1890	&& !(head->attacktype & AT_COUNTERSPELL)
1875	&& !QUERY_FLAG (head, FLAG_MONSTER)	1891	&& !head->flag [FLAG_MONSTER]
1876	&& (op->level > head->level))	1892	&& (op->level > head->level))
1877	head->destroy ();	1893	head->destroy ();
1878	else	1894	else
1879	switch (head->type)	1895	switch (head->type)
1880	{	1896	{
1881	case SPELL_EFFECT:	1897	case SPELL_EFFECT:
1882	// XXX: Don't affect floor spelleffects. See also XXX comment	1898	// XXX: Don't affect floor spelleffects. See also XXX comment
1883	// about sanctuary in spell_util.C	1899	// about sanctuary in spell_util.C
1884	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1900	if (tmp->flag [FLAG_IS_FLOOR])
1885	continue;	1901	continue;
1886		1902
1887	if (op->level > head->level)	1903	if (op->level > head->level)
1888	head->destroy ();	1904	head->destroy ();
1889		1905
…		…
1912		1928
1913	object *tmp, *god = find_god (determine_god (op));	1929	object *tmp, *god = find_god (determine_god (op));
1914		1930
1915	if (!god)	1931	if (!god)
1916	{	1932	{
1917	new_draw_info (NDI_UNIQUE, 0, op, "You can't consecrate anything if you don't worship a god!");	1933	op->failmsg ("You can't consecrate anything if you don't worship a god!");
1918	return 0;	1934	return 0;
1919	}	1935	}
1920		1936
1921	for (tmp = op->below; tmp; tmp = tmp->below)	1937	for (tmp = op->below; tmp; tmp = tmp->below)
1922	{	1938	{
1923	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1939	if (tmp->flag [FLAG_IS_FLOOR])
1924	break;	1940	break;
1925	if (tmp->type == HOLY_ALTAR)	1941	if (tmp->type == HOLY_ALTAR)
1926	{	1942	{
1927		1943
1928	if (tmp->level > caster_level (caster, spell))	1944	if (tmp->level > casting_level (caster, spell))
1929	{	1945	{
1930	new_draw_info_format (NDI_UNIQUE, 0, op, "You are not powerful enough to reconsecrate the %s", &tmp->name);	1946	op->failmsgf ("You are not powerful enough to reconsecrate the %s", &tmp->name);
1931	return 0;	1947	return 0;
1932	}	1948	}
1933	else	1949	else
1934	{	1950	{
1935	/* If we got here, we are consecrating an altar */	1951	/* If we got here, we are consecrating an altar */
1936	sprintf (buf, "Altar of %s", &god->name);	1952	sprintf (buf, "Altar of %s", &god->name);
1937	tmp->name = buf;	1953	tmp->name = buf;
1938	tmp->level = caster_level (caster, spell);	1954	tmp->level = casting_level (caster, spell);
1939	tmp->other_arch = god->arch;	1955	tmp->other_arch = god->arch;
1940		1956
1941	if (op->type == PLAYER)	1957	if (op->type == PLAYER)
1942	esrv_update_item (UPD_NAME, op, tmp);	1958	esrv_update_item (UPD_NAME, op, tmp);
1943		1959
1944	new_draw_info_format (NDI_UNIQUE, 0, op, "You consecrated the altar to %s!", &god->name);	1960	new_draw_info_format (NDI_UNIQUE, 0, op, "You consecrated the altar to %s!", &god->name);
1945	return 1;	1961	return 1;
1946	}	1962	}
1947	}	1963	}
1948	}	1964	}
1949	new_draw_info (NDI_UNIQUE, 0, op, "You are not standing over an altar!");	1965
		1966	op->failmsg ("You are not standing over an altar!");
1950	return 0;	1967	return 0;
1951	}	1968	}
1952		1969
1953	/* animate_weapon -	1970	/* animate_weapon -
1954	* Generalization of staff_to_snake. Makes a golem out of the caster's weapon.	1971	* Generalization of staff_to_snake. Makes a golem out of the caster's weapon.
…		…
1996		2013
1997	/* if there's no place to put the golem, abort */	2014	/* if there's no place to put the golem, abort */
1998	if (dir < 0 || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP)	2015	if (dir < 0 || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP)
1999	|| ((spell->other_arch->move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->move_type))	2016	|| ((spell->other_arch->move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->move_type))
2000	{	2017	{
2001	new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");	2018	op->failmsg ("There is something in the way.");
2002	return 0;	2019	return 0;
2003	}	2020	}
2004		2021
2005	/* Use the weapon marked by the player. */	2022	/* Use the weapon marked by the player. */
2006	weapon = find_marked_object (op);	2023	weapon = find_marked_object (op);
2007		2024
2008	if (!weapon)	2025	if (!weapon)
2009	{	2026	{
2010	new_draw_info (NDI_BLACK, 0, op, "You must mark a weapon to use with this spell!");	2027	op->failmsg ("You must mark a weapon to use with this spell!");
2011	return 0;	2028	return 0;
2012	}	2029	}
		2030
2013	if (spell->race && strcmp (weapon->arch->archname, spell->race))	2031	if (spell->race && weapon->arch->archname != spell->race)
2014	{	2032	{
2015	new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to transform your weapon.");	2033	op->failmsg ("The spell fails to transform your weapon.");
2016	return 0;	2034	return 0;
2017	}	2035	}
		2036
2018	if (weapon->type != WEAPON)	2037	if (weapon->type != WEAPON)
2019	{	2038	{
2020	new_draw_info (NDI_UNIQUE, 0, op, "You need to wield a weapon to animate it.");	2039	op->failmsg ("You need to wield a weapon to animate it.");
2021	return 0;	2040	return 0;
2022	}	2041	}
2023	if (QUERY_FLAG (weapon, FLAG_APPLIED))	2042
		2043	if (weapon->flag [FLAG_APPLIED])
2024	{	2044	{
2025	new_draw_info_format (NDI_BLACK, 0, op, "You need to unequip %s before using it in this spell", query_name (weapon));	2045	op->failmsgf ("You need to unequip %s before using it in this spell", query_name (weapon));
2026	return 0;	2046	return 0;
2027	}	2047	}
2028		2048
2029	weapon = weapon->split ();	2049	weapon = weapon->split ();
2030		2050
2031	/* create the golem object */	2051	/* create the golem object */
2032	tmp = arch_to_object (spell->other_arch);	2052	tmp = spell->other_arch->instance ();
2033		2053
2034	/* if animated by a player, give the player control of the golem */	2054	/* if animated by a player, give the player control of the golem */
2035	CLEAR_FLAG (tmp, FLAG_MONSTER);	2055	tmp->clr_flag (FLAG_MONSTER);
2036	tmp->stats.exp = 0;	2056	tmp->stats.exp = 0;
2037	add_friendly_object (tmp);	2057	add_friendly_object (tmp);
2038	tmp->type = GOLEM;	2058	tmp->type = GOLEM;
2039	tmp->set_owner (op);	2059	tmp->set_owner (op);
2040	op->contr->golem = tmp;	2060	op->contr->golem = tmp;
…		…
2042		2062
2043	/* Give the weapon to the golem now. A bit of a hack to check the	2063	/* Give the weapon to the golem now. A bit of a hack to check the
2044	* removed flag - it should only be set if weapon->split was	2064	* removed flag - it should only be set if weapon->split was
2045	* used above.	2065	* used above.
2046	*/	2066	*/
2047	if (!QUERY_FLAG (weapon, FLAG_REMOVED))	2067	if (!weapon->flag [FLAG_REMOVED])
2048	weapon->remove ();	2068	weapon->remove ();
2049		2069
2050	tmp->insert (weapon);	2070	tmp->insert (weapon);
2051		2071
2052	/* To do everything necessary to let a golem use the weapon is a pain,	2072	/* To do everything necessary to let a golem use the weapon is a pain,
2053	* so instead, just set it as equipped (otherwise, we need to update	2073	* so instead, just set it as equipped (otherwise, we need to update
2054	* body_info, skills, etc)	2074	* body_info, skills, etc)
2055	*/	2075	*/
2056	SET_FLAG (tmp, FLAG_USE_WEAPON);	2076	tmp->set_flag (FLAG_USE_WEAPON);
2057	SET_FLAG (weapon, FLAG_APPLIED);	2077	weapon->set_flag (FLAG_APPLIED);
2058	tmp->update_stats ();	2078	tmp->update_stats ();
2059		2079
2060	/* There used to be 'odd' code that basically seemed to take the absolute	2080	/* There used to be 'odd' code that basically seemed to take the absolute
2061	* value of the weapon->magic an use that. IMO, that doesn't make sense -	2081	* value of the weapon->magic an use that. IMO, that doesn't make sense -
2062	* if you're using a crappy weapon, it shouldn't be as good.	2082	* if you're using a crappy weapon, it shouldn't be as good.
…		…
2082		2102
2083	/* attacktype */	2103	/* attacktype */
2084	if (!tmp->attacktype)	2104	if (!tmp->attacktype)
2085	tmp->attacktype = AT_PHYSICAL;	2105	tmp->attacktype = AT_PHYSICAL;
2086		2106
2087	if (materialtype_t *mt = name_to_material (op->materialname))
2088	{
2089	for (i = 0; i < NROFATTACKS; i++)	2107	for (i = 0; i < NROFATTACKS; i++)
2090	tmp->resist[i] = 50 - (mt->save[i] * 5);	2108	tmp->resist[i] = 50 - (op->material->save[i] * 5);
2091	a = mt->save[0];	2109
2092	}	2110	a = op->material->save[0];
2093	else
2094	{
2095	for (i = 0; i < NROFATTACKS; i++)
2096	tmp->resist[i] = 5;
2097	a = 10;
2098	}
2099		2111
2100	/* Set weapon's immunity */	2112	/* Set weapon's immunity */
2101	tmp->resist[ATNR_CONFUSION] = 100;	2113	tmp->resist[ATNR_CONFUSION] = 100;
2102	tmp->resist[ATNR_POISON] = 100;	2114	tmp->resist[ATNR_POISON] = 100;
2103	tmp->resist[ATNR_SLOW] = 100;	2115	tmp->resist[ATNR_SLOW] = 100;
…		…
2130	tmp->state = weapon->state;	2142	tmp->state = weapon->state;
2131	tmp->flag [FLAG_ANIMATE] = weapon->flag [FLAG_ANIMATE];	2143	tmp->flag [FLAG_ANIMATE] = weapon->flag [FLAG_ANIMATE];
2132	}	2144	}
2133		2145
2134	/* make experience increase in proportion to the strength of the summoned creature. */	2146	/* make experience increase in proportion to the strength of the summoned creature. */
2135	tmp->stats.exp *= 1 + (MAX (spell->stats.maxgrace, spell->stats.sp) / caster_level (caster, spell));	2147	tmp->stats.exp *= 1 + (max (spell->stats.maxgrace, spell->stats.sp) / casting_level (caster, spell));
2136		2148
2137	tmp->speed_left = -1;	2149	tmp->speed_left = -1;
2138	tmp->direction = dir;	2150	tmp->direction = dir;
2139		2151
2140	m->insert (tmp, x, y, op);	2152	m->insert (tmp, x, y, op);
…		…
2144	/* cast_daylight() - changes the map darkness level *lower* */	2156	/* cast_daylight() - changes the map darkness level *lower* */
2145		2157
2146	/* cast_change_map_lightlevel: Was cast_daylight/nightfall.	2158	/* cast_change_map_lightlevel: Was cast_daylight/nightfall.
2147	* This changes the light level for the entire map.	2159	* This changes the light level for the entire map.
2148	*/	2160	*/
2149
2150	int	2161	int
2151	cast_change_map_lightlevel (object *op, object *caster, object *spell)	2162	cast_change_map_lightlevel (object *op, object *caster, object *spell)
2152	{	2163	{
2153	int success;	2164	int success;
2154		2165
…		…
2158	success = op->map->change_map_light (spell->stats.dam);	2169	success = op->map->change_map_light (spell->stats.dam);
2159		2170
2160	if (!success)	2171	if (!success)
2161	{	2172	{
2162	if (spell->stats.dam < 0)	2173	if (spell->stats.dam < 0)
2163	new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here.");	2174	op->failmsg ("It can be no brighter here.");
2164	else	2175	else
2165	new_draw_info (NDI_UNIQUE, 0, op, "It can be no darker here.");	2176	op->failmsg ("It can be no darker here.");
2166	}	2177	}
		2178
2167	return success;	2179	return success;
2168	}	2180	}
2169		2181
2170	/* create an aura spell object and put it in the player's inventory.	2182	/* create an aura spell object and put it in the player's inventory.
2171	* as usual, op is player, caster is the object casting the spell,	2183	* as usual, op is player, caster is the object casting the spell,
…		…
2179		2191
2180	new_aura = present_arch_in_ob (spell->other_arch, op);	2192	new_aura = present_arch_in_ob (spell->other_arch, op);
2181	if (new_aura)	2193	if (new_aura)
2182	refresh = 1;	2194	refresh = 1;
2183	else	2195	else
2184	new_aura = arch_to_object (spell->other_arch);	2196	new_aura = spell->other_arch->instance ();
2185		2197
2186	new_aura->duration = spell->duration + 10 * SP_level_duration_adjust (caster, spell);	2198	new_aura->duration = spell->duration + 10 * SP_level_duration_adjust (caster, spell);
2187		2199
2188	new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);	2200	new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
2189		2201
2190	set_spell_skill (op, caster, spell, new_aura);	2202	set_spell_skill (op, caster, spell, new_aura);
2191	new_aura->attacktype = spell->attacktype;	2203	new_aura->attacktype = spell->attacktype;
2192		2204
2193	new_aura->level = caster_level (caster, spell);	2205	new_aura->level = casting_level (caster, spell);
2194		2206
2195	if (refresh)	2207	if (refresh)
2196	new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");	2208	new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
2197	else	2209	else
2198	new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force.");	2210	new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force.");
…		…
2254	if (pos.normalise () && !(OB_TYPE_MOVE_BLOCK (env, pos->move_block)))	2266	if (pos.normalise () && !(OB_TYPE_MOVE_BLOCK (env, pos->move_block)))
2255	{	2267	{
2256	hit_map (aura, i, aura->attacktype, 0);	2268	hit_map (aura, i, aura->attacktype, 0);
2257		2269
2258	if (aura->other_arch)	2270	if (aura->other_arch)
2259	pos.insert (arch_to_object (aura->other_arch), aura);	2271	pos.insert (aura->other_arch->instance (), aura);
2260	}	2272	}
2261	}	2273	}
2262		2274
2263	/* put the aura back in the player's inventory */	2275	/* put the aura back in the player's inventory */
2264	env->insert (aura);	2276	env->insert (aura);
…		…
2269	* op is the piece object.	2281	* op is the piece object.
2270	*/	2282	*/
2271	void	2283	void
2272	move_peacemaker (object *op)	2284	move_peacemaker (object *op)
2273	{	2285	{
2274	object *tmp;	2286	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
2275
2276	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
2277	{	2287	{
2278	int atk_lev, def_lev;	2288	int atk_lev, def_lev;
2279	object *victim = tmp->head_ ();	2289	object *victim = tmp->head_ ();
2280		2290
2281	if (!QUERY_FLAG (victim, FLAG_MONSTER))	2291	if (!victim->flag [FLAG_MONSTER])
2282	continue;	2292	continue;
2283		2293
2284	if (QUERY_FLAG (victim, FLAG_UNAGGRESSIVE))	2294	if (victim->flag [FLAG_UNAGGRESSIVE])
2285	continue;	2295	continue;
2286		2296
2287	if (victim->stats.exp == 0)	2297	if (victim->stats.exp == 0)
2288	continue;	2298	continue;
2289		2299
2290	def_lev = MAX (1, victim->level);	2300	def_lev = max (1, victim->level);
2291	atk_lev = MAX (1, op->level);	2301	atk_lev = max (1, op->level);
2292		2302
2293	if (rndm (0, atk_lev - 1) > def_lev)	2303	if (rndm (0, atk_lev - 1) > def_lev)
2294	{	2304	{
2295	/* make this sucker peaceful. */	2305	/* make this sucker peaceful. */
2296		2306
…		…
2305	victim->stats.sp = 0;	2315	victim->stats.sp = 0;
2306	victim->stats.grace = 0;	2316	victim->stats.grace = 0;
2307	victim->stats.Pow = 0;	2317	victim->stats.Pow = 0;
2308	#endif	2318	#endif
2309	victim->attack_movement = RANDO2;	2319	victim->attack_movement = RANDO2;
2310	SET_FLAG (victim, FLAG_UNAGGRESSIVE);	2320	victim->set_flag (FLAG_UNAGGRESSIVE);
2311	SET_FLAG (victim, FLAG_RUN_AWAY);	2321	victim->set_flag (FLAG_RUN_AWAY);
2312	SET_FLAG (victim, FLAG_RANDOM_MOVE);	2322	victim->set_flag (FLAG_RANDOM_MOVE);
2313	CLEAR_FLAG (victim, FLAG_MONSTER);	2323	victim->clr_flag (FLAG_MONSTER);
2314		2324
2315	if (victim->name)	2325	if (victim->name)
2316	new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s no longer feels like fighting.", &victim->name);	2326	new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s no longer feels like fighting.", &victim->name);
2317	}	2327	}
2318	}	2328	}
2319	}	2329	}
2320
2321		2330
2322	/* This writes a rune that contains the appropriate message.	2331	/* This writes a rune that contains the appropriate message.
2323	* There really isn't any adjustments we make.	2332	* There really isn't any adjustments we make.
2324	*/	2333	*/
2325
2326	int	2334	int
2327	write_mark (object *op, object *spell, const char *msg)	2335	write_mark (object *op, object *spell, const char *msg)
2328	{	2336	{
2329	char rune[HUGE_BUF];
2330	object *tmp;
2331
2332	if (!msg || msg[0] == 0)	2337	if (!msg || msg[0] == 0)
2333	{	2338	{
2334	new_draw_info (NDI_UNIQUE, 0, op, "Write what?");	2339	op->failmsg ("Write what?");
2335	return 0;	2340	return 0;
2336	}	2341	}
2337		2342
2338	if (strcasestr_local (msg, "endmsg"))	2343	if (!msg_is_safe (msg))
2339	{	2344	{
2340	new_draw_info (NDI_UNIQUE, 0, op, "Trying to cheat are we?");	2345	op->failmsg ("Trying to cheat are we? H<@-signs are not allowed in marking runes.>");
2341	LOG (llevInfo, "write_rune: player %s tried to write bogus rune %s\n", &op->name, msg);	2346	LOG (llevInfo, "write_mark: player %s tried to write bogus rune %s\n", &op->name, msg);
2342	return 0;	2347	return 0;
2343	}	2348	}
		2349
2344	if (!spell->other_arch)	2350	if (!spell->other_arch)
2345	return 0;	2351	return 0;
2346	tmp = arch_to_object (spell->other_arch);
2347		2352
2348	snprintf (rune, sizeof (rune), "%s\n", msg);	2353	object *tmp = spell->other_arch->instance ();
2349		2354
2350	tmp->race = op->name; /*Save the owner of the rune */	2355	tmp->race = op->name; /*Save the owner of the rune */
2351	tmp->msg = rune;	2356	tmp->msg = msg;
2352		2357
2353	tmp->insert_at (op, op, INS_BELOW_ORIGINATOR);	2358	tmp->insert_at (op, op, INS_BELOW_ORIGINATOR);
		2359
2354	return 1;	2360	return 1;
2355	}	2361	}
		2362

Diff Legend

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