ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/server/apply.C

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.169 by root, Sun Sep 7 21:31:23 2008 UTC vs.
Revision 1.205 by root, Wed Oct 21 00:44:39 2009 UTC

…		…
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 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 <cmath>	25	#include <cmath>
…		…
92	* Return value: 1 if money was destroyed, 0 if not.	93	* Return value: 1 if money was destroyed, 0 if not.
93	*/	94	*/
94	static int	95	static int
95	apply_id_altar (object *money, object *altar, object *pl)	96	apply_id_altar (object *money, object *altar, object *pl)
96	{	97	{
97	dynbuf_text buf;	98	dynbuf_text &buf = msg_dynbuf; buf.clear ();
98		99
99	if (!pl || pl->type != PLAYER)	100	if (!pl || pl->type != PLAYER)
100	return 0;	101	return 0;
101		102
102	/* Check for MONEY type is a special hack - it prevents 'nothing needs	103	/* Check for MONEY type is a special hack - it prevents 'nothing needs
103	* identifying' from being printed out more than it needs to be.	104	* identifying' from being printed out more than it needs to be.
104	*/	105	*/
105	if (!check_altar_sacrifice (altar, money) || money->type != MONEY)	106	if (!check_altar_sacrifice (altar, money, pl) || money->type != MONEY)
106	return 0;	107	return 0;
107		108
108	/* if the player has a marked item, identify that if it needs to be	109	/* if the player has a marked item, identify that if it needs to be
109	* identified. If it doesn't, then go through the player inventory.	110	* identified. If it doesn't, then go through the player inventory.
110	*/	111	*/
111	if (object *marked = find_marked_object (pl))	112	if (object *marked = find_marked_object (pl))
112	if (!QUERY_FLAG (marked, FLAG_IDENTIFIED) && need_identify (marked))	113	if (!QUERY_FLAG (marked, FLAG_IDENTIFIED) && need_identify (marked))
113	{	114	{
114	if (operate_altar (altar, &money))	115	if (operate_altar (altar, &money, pl))
115	{	116	{
116	identify (marked);	117	identify (marked);
117		118
118	buf.printf ("You have %s.\r", long_desc (marked, pl));	119	buf.printf ("You have %s.\r", long_desc (marked, pl));
119	if (marked->msg)	120	if (marked->msg)
…		…
125		126
126	for (object *id = pl->inv; id; id = id->below)	127	for (object *id = pl->inv; id; id = id->below)
127	{	128	{
128	if (!QUERY_FLAG (id, FLAG_IDENTIFIED) && !id->invisible && need_identify (id))	129	if (!QUERY_FLAG (id, FLAG_IDENTIFIED) && !id->invisible && need_identify (id))
129	{	130	{
130	if (operate_altar (altar, &money))	131	if (operate_altar (altar, &money, pl))
131	{	132	{
132	identify (id);	133	identify (id);
133		134
134	buf.printf ("You have %s.\r", long_desc (id, pl));	135	buf.printf ("You have %s.\r", long_desc (id, pl));
135	if (id->msg)	136	if (id->msg)
…		…
160	* matching item.	161	* matching item.
161	**/	162	**/
162	void	163	void
163	handle_apply_yield (object *tmp)	164	handle_apply_yield (object *tmp)
164	{	165	{
165	if (shstr yield = tmp->kv (shstr_on_use_yield))	166	if (shstr_tmp yield = tmp->kv (shstr_on_use_yield))
166	archetype::get (yield)->insert_at (tmp, tmp, INS_BELOW_ORIGINATOR);	167	archetype::get (yield)->insert_at (tmp, tmp, INS_BELOW_ORIGINATOR);
167	}	168	}
168		169
169	/**	170	/**
170	* Handles applying a potion.	171	* Handles applying a potion.
…		…
315	*/	316	*/
316	if (tmp->inv)	317	if (tmp->inv)
317	{	318	{
318	if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))	319	if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
319	{	320	{
320	object *fball;
321
322	op->failmsg ("Yech! Your lungs are on fire!");	321	op->failmsg ("Yech! Your lungs are on fire!");
323		322	create_exploding_ball_at (op, op->level);
324	/* Explodes a fireball centered at player */
325	fball = get_archetype (EXPLODING_FIREBALL);
326	fball->dam_modifier = random_roll (1, op->level, op, PREFER_LOW) / 5 + 1;
327	fball->stats.maxhp = random_roll (1, op->level, op, PREFER_LOW) / 10 + 2;
328	fball->x = op->x;
329	fball->y = op->y;
330	insert_ob_in_map (fball, op->map, NULL, 0);
331	}	323	}
332	else	324	else
333	cast_spell (op, tmp, op->facing, tmp->inv, NULL);	325	cast_spell (op, tmp, op->facing, tmp->inv, NULL);
334		326
335	tmp->decrease ();	327	tmp->decrease ();
…		…
378	}	370	}
379		371
380	/* Only thing left are the stat potions */	372	/* Only thing left are the stat potions */
381	if (op->type == PLAYER)	373	if (op->type == PLAYER)
382	{ /* only for players */	374	{ /* only for players */
383	if ((QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->value != 0)	375	if ((QUERY_FLAG (tmp, FLAG_CURSED)
		376	|| QUERY_FLAG (tmp, FLAG_DAMNED))
		377	&& tmp->value != 0)
384	CLEAR_FLAG (tmp, FLAG_APPLIED);	378	CLEAR_FLAG (tmp, FLAG_APPLIED);
385	else	379	else
386	SET_FLAG (tmp, FLAG_APPLIED);	380	SET_FLAG (tmp, FLAG_APPLIED);
387		381
388	if (!change_abil (op, tmp))	382	if (!change_abil (op, tmp))
…		…
403	/****************************************************************************	397	/****************************************************************************
404	* Weapon improvement code follows	398	* Weapon improvement code follows
405	****************************************************************************/	399	****************************************************************************/
406		400
407	/**	401	/**
		402	* This function just checks whether who can handle equipping an item
		403	* with item_power.
		404	*/
		405
		406	bool
		407	check_item_power (object *who, int item_power)
		408	{
		409	if (who->type == PLAYER
		410	&& item_power
		411	&& item_power + who->contr->item_power > settings.item_power_factor * who->level)
		412	return false;
		413	else
		414	return true;
		415	}
		416
		417	/**
408	* This returns the sum of nrof of item (arch name).	418	* This returns the sum of nrof of item (arch name).
409	*/	419	*/
410	static int	420	static int
411	check_item (object *op, const char *item)	421	check_item (object *op, shstr_cmp item)
412	{	422	{
413	int count = 0;	423	int count = 0;
414		424
415	if (!item)	425	if (!item)
416	return 0;	426	return 0;
417		427
418	for (op = op->below; op; op = op->below)	428	for (op = op->below; op; op = op->below)
419	{
420	if (strcmp (op->arch->archname, item) == 0)	429	if (op->arch->archname == item)
421	{
422	if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED)	430	if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED)
423	/* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID))	431	&& /* Loophole bug? -FD- */ !QUERY_FLAG (op, FLAG_UNPAID))
424	{
425	if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */
426	count++;
427	else
428	count += op->nrof;	432	count += op->number_of ();
429	}
430	}
431	}
432		433
433	return count;	434	return count;
434	}	435	}
435		436
436	/**	437	/**
…		…
438	* op is typically the player, which is only	439	* op is typically the player, which is only
439	* really used to determine what space to look at.	440	* really used to determine what space to look at.
440	* Modified to only eat 'nrof' of objects.	441	* Modified to only eat 'nrof' of objects.
441	*/	442	*/
442	static void	443	static void
443	eat_item (object *op, const char *item, uint32 nrof)	444	eat_item (object *op, shstr_cmp item, uint32 nrof)
444	{	445	{
445	object *prev;	446	object *prev;
446		447
447	prev = op;	448	prev = op;
448	op = op->below;	449	op = op->below;
449		450
450	while (op)	451	while (op)
451	{	452	{
452	if (strcmp (op->arch->archname, item) == 0)	453	if (op->arch->archname == item)
453	{	454	{
454	if (op->nrof >= nrof)	455	if (op->nrof >= nrof)
455	{	456	{
456	op->decrease (nrof);	457	op->decrease (nrof);
457	return;	458	return;
…		…
466	}	467	}
467		468
468	prev = op;	469	prev = op;
469	op = op->below;	470	op = op->below;
470	}	471	}
471	}
472
473	/**
474	* This checks to see of the player (who) is sufficient level to use a weapon
475	* with improvs improvements (typically last_eat). We take an int here
476	* instead of the object so that the improvement code can pass along the
477	* increased value to see if the object is usuable.
478	* we return 1 (true) if the player can use the weapon.
479	*/
480	static int
481	check_weapon_power (const object *who, int improvs)
482	{
483	/* Old code is below (commented out). Basically, since weapons are the only
484	* object players really have any control to improve, it's a bit harsh to
485	* require high level in some combat skill, so we just use overall level.
486	*/
487	#if 1
488	if (((who->level / 5) + 5) >= improvs)
489	return 1;
490	else
491	return 0;
492
493	#else
494	int level = 0;
495
496	/* The skill system hands out wc and dam bonuses to fighters
497	* more generously than the old system (see fix_player). Thus
498	* we need to curtail the power of player enchanted weapons.
499	* I changed this to 1 improvement per "fighter" level/5 -b.t.
500	* Note: Nothing should break by allowing this ratio to be different or
501	* using normal level - it is just a matter of play balance.
502	*/
503	if (who->type == PLAYER)
504	{
505	object *wc_obj = NULL;
506
507	for (wc_obj = who->inv; wc_obj; wc_obj = wc_obj->below)
508	if (wc_obj->type == SKILL && IS_COMBAT_SKILL (wc_obj->subtype) && wc_obj->level > level)
509	level = wc_obj->level;
510
511	if (!level)
512	{
513	LOG (llevError, "Error: Player: %s lacks wc experience object\n", who->name);
514	level = who->level;
515	}
516	}
517	else
518	level = who->level;
519
520	return (improvs <= ((level / 5) + 5));
521	#endif
522	}	472	}
523		473
524	/**	474	/**
525	* Returns how many items of type improver->slaying there are under op.	475	* Returns how many items of type improver->slaying there are under op.
526	* Will display a message if none found, and 1 if improver->slaying is NULL.	476	* Will display a message if none found, and 1 if improver->slaying is NULL.
…		…
655	if (improver->stats.sp == IMPROVE_PREPARE)	605	if (improver->stats.sp == IMPROVE_PREPARE)
656	return prepare_weapon (op, improver, weapon);	606	return prepare_weapon (op, improver, weapon);
657		607
658	if (weapon->level == 0)	608	if (weapon->level == 0)
659	{	609	{
660	op->failmsg ("This weapon has not been prepared. H<You first ahve to prepare a weapon with a prepare weapon scroll.>");	610	op->failmsg (
		611	"This weapon has not been prepared."
		612	" H<You first have to prepare a weapon with a prepare weapon scroll.>");
661	return 0;	613	return 0;
662	}	614	}
663		615
664	if (weapon->level == weapon->last_eat && weapon->item_power >= 100)	616	if (weapon->last_eat >= weapon->level // improvements used up
		617	|| weapon->item_power >= 100) // or item_power >= arbitrary limit of 100
665	{	618	{
666	op->failmsg ("This weapon cannot be improved any more.");	619	op->failmsg ("This weapon cannot be improved any more.");
667	return 0;	620	return 0;
668	}	621	}
669		622
670	if (QUERY_FLAG (weapon, FLAG_APPLIED) && !check_weapon_power (op, weapon->last_eat + 1))	623	if (QUERY_FLAG (weapon, FLAG_APPLIED)
		624	&& !check_item_power (op, weapon->item_power + 1))
671	{	625	{
672	op->failmsg ("Improving the weapon will make it too "	626	op->failmsg ("Improving the weapon will make it too "
673	"powerful for you to use. Unready it if you "	627	"powerful for you to use. Unready it if you "
674	"really want to improve it.");	628	"really want to improve it.");
675	return 0;	629	return 0;
…		…
904	* Takes one type of items and makes another.	858	* Takes one type of items and makes another.
905	* converter is the object that is doing the conversion.	859	* converter is the object that is doing the conversion.
906	* item is the object that triggered the converter - if it is not	860	* item is the object that triggered the converter - if it is not
907	* what the converter wants, this will not do anything.	861	* what the converter wants, this will not do anything.
908	*/	862	*/
909	static int	863	int
910	convert_item (object *item, object *converter)	864	convert_item (object *item, object *converter)
911	{	865	{
912	sint64 nr, price_in;	866	sint64 nr, price_in;
913		867
914	if (item->flag [FLAG_UNPAID])	868	if (item->flag [FLAG_UNPAID])
…		…
995	item->nrof = give;	949	item->nrof = give;
996		950
997	if (nr)	951	if (nr)
998	item->nrof *= nr;	952	item->nrof *= nr;
999		953
1000	if (is_in_shop (converter))	954	if (converter->flag [FLAG_PRECIOUS])
1001	SET_FLAG (item, FLAG_UNPAID);	955	SET_FLAG (item, FLAG_UNPAID);
		956
		957	if (is_in_shop (converter))
		958	{
		959	// converters on shop floors don't work anymore, bug lets check for it
		960	// and report in case someone still does it.
		961	LOG (llevDebug, "ITEMBUG: broken converter, converters on shop floor don't work: %s\n",
		962	converter->debug_desc ());
		963	SET_FLAG (item, FLAG_UNPAID);
		964	}
1002	else if (price_in < sint64 (item->nrof) * item->value)	965	else if (price_in < sint64 (item->nrof) * item->value)
1003	{	966	{
1004	LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",	967	LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
1005	&converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);	968	&converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1006	/**	969	/**
…		…
1045	}	1008	}
1046		1009
1047	// already applied == open on ground, or open in inv, or active in inv	1010	// already applied == open on ground, or open in inv, or active in inv
1048	if (sack->flag [FLAG_APPLIED])	1011	if (sack->flag [FLAG_APPLIED])
1049	{	1012	{
1050	if (op->container == sack)	1013	if (op->container_ () == sack)
1051	{	1014	{
1052	// open on ground or inv, so close	1015	// open on ground or inv, so close
1053	op->close_container ();	1016	op->close_container ();
1054	return 1;	1017	return 1;
1055	}	1018	}
…		…
1098	{	1061	{
1099	/* Only players can make sacrifices on spell casting altars. */	1062	/* Only players can make sacrifices on spell casting altars. */
1100	if (altar->inv && (!originator || originator->type != PLAYER))	1063	if (altar->inv && (!originator || originator->type != PLAYER))
1101	return 0;	1064	return 0;
1102		1065
1103	if (operate_altar (altar, &sacrifice))	1066	if (operate_altar (altar, &sacrifice, originator))
1104	{	1067	{
1105	/* Simple check. Unfortunately, it means you can't cast magic bullet	1068	/* Simple check. Unfortunately, it means you can't cast magic bullet
1106	* with an altar. We call it a Potion - altars are stationary - it	1069	* with an altar. We call it a Potion - altars are stationary - it
1107	* is up to map designers to use them properly.	1070	* is up to map designers to use them properly.
1108	*/	1071	*/
…		…
1117	/* push_button (altar);*/	1080	/* push_button (altar);*/
1118	}	1081	}
1119	else	1082	else
1120	{	1083	{
1121	altar->value = 1; /* works only once */	1084	altar->value = 1; /* works only once */
1122	push_button (altar);	1085	push_button (altar, originator);
1123	}	1086	}
1124		1087
1125	return !sacrifice;	1088	return !sacrifice;
1126	}	1089	}
1127	else	1090	else
…		…
1144		1107
1145	SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */	1108	SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */
1146		1109
1147	bool has_unpaid = false;	1110	bool has_unpaid = false;
1148		1111
1149	// quite inefficient to do this here twice, but the api doesn'T lend itself to	1112	// quite inefficient to do this here twice, but the api doesn't lend itself to
1150	// a quick and small change :(	1113	// a quick and small change :(
1151	for (object::depth_iterator item = op->begin (); item != op->end (); ++item)	1114	for (object::depth_iterator item = op->begin (); item != op->end (); ++item)
1152	if (item->flag [FLAG_UNPAID])	1115	if (item->flag [FLAG_UNPAID])
1153	{	1116	{
1154	has_unpaid = true;	1117	has_unpaid = true;
1155	break;	1118	break;
1156	}	1119	}
1157		1120
1158	if (op->type != PLAYER)	1121	if (!op->is_player ())
1159	{	1122	{
1160	/* Remove all the unpaid objects that may be carried here.	1123	/* Remove all the unpaid objects that may be carried here.
1161	* This could be pets or monsters that are somehow in	1124	* This could be pets or monsters that are somehow in
1162	* the shop.	1125	* the shop.
1163	*/	1126	*/
…		…
1167		1130
1168	if (QUERY_FLAG (tmp, FLAG_UNPAID))	1131	if (QUERY_FLAG (tmp, FLAG_UNPAID))
1169	{	1132	{
1170	int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9);	1133	int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9);
1171		1134
		1135	if (i >= 0)
1172	tmp->remove ();	1136	tmp->move (i);
1173
1174	if (i == -1)
1175	i = 0;
1176
1177	tmp->map = op->map;
1178	tmp->x = op->x + freearr_x[i];
1179	tmp->y = op->y + freearr_y[i];
1180	insert_ob_in_map (tmp, op->map, op, 0);
1181	}	1137	}
1182	}	1138	}
1183		1139
1184	/* Don't teleport things like spell effects */	1140	/* Don't teleport things like spell effects */
1185	if (QUERY_FLAG (op, FLAG_NO_PICK))	1141	if (QUERY_FLAG (op, FLAG_NO_PICK))
…		…
1196	if (i != -1)	1152	if (i != -1)
1197	rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat);	1153	rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat);
1198		1154
1199	return 0;	1155	return 0;
1200	}	1156	}
		1157
1201	/* Removed code that checked for multipart objects - it appears that	1158	/* Removed code that checked for multipart objects - it appears that
1202	* the teleport function should be able to handle this just fine.	1159	* the teleport function should be able to handle this just fine.
1203	*/	1160	*/
1204	rv = teleport (shop_mat, SHOP_MAT, op);	1161	rv = teleport (shop_mat, SHOP_MAT, op);
1205	}	1162	}
…		…
1260	* Handles applying a sign.	1217	* Handles applying a sign.
1261	*/	1218	*/
1262	static void	1219	static void
1263	apply_sign (object *op, object *sign, int autoapply)	1220	apply_sign (object *op, object *sign, int autoapply)
1264	{	1221	{
		1222	if (!op->is_player())
		1223	return;
		1224
1265	if (sign->has_dialogue ())	1225	if (sign->has_dialogue ())
1266	{	1226	{
1267	op->statusmsg (form ("Maybe you should I<talk> to the %s instead?", &sign->name));	1227	op->statusmsg (format ("Maybe you should I<talk> to the %s instead?", &sign->name));
1268	return;	1228	return;
1269	}	1229	}
1270		1230
1271	if (!sign->msg)	1231	if (!sign->msg)
1272	{	1232	{
1273	op->statusmsg ("Nothing is written on it.");	1233	op->contr->infobox (MSG_CHANNEL ("examine"),
		1234	format ("T<%s>\n\n Nothing %sis written on it.",
		1235	&sign->name,
		1236	sign->name == sign->arch->name ? "" : "else "));
1274	return;	1237	return;
1275	}	1238	}
1276		1239
1277	if (sign->stats.food)	1240	if (sign->stats.food)
1278	{	1241	{
1279	if (sign->last_eat >= sign->stats.food)	1242	if (sign->last_eat >= sign->stats.food)
1280	{	1243	{
1281	if (!sign->move_on)	1244	if (!sign->move_on)
1282	op->statusmsg ("You cannot read it anymore.");	1245	op->failmsg ("You cannot read it anymore.");
1283		1246
1284	return;	1247	return;
1285	}	1248	}
1286		1249
1287	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1250	if (!QUERY_FLAG (op, FLAG_WIZPASS))
…		…
1305	if (sign->sound)	1268	if (sign->sound)
1306	ns->play_sound (sign->sound);	1269	ns->play_sound (sign->sound);
1307	else if (autoapply)	1270	else if (autoapply)
1308	ns->play_sound (sound_find ("msg_voice"));	1271	ns->play_sound (sound_find ("msg_voice"));
1309		1272
1310	if (ns->can_msg)
1311	op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n\n\n%s", &sign->name, &sign->msg));	1273	op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n%s", &sign->name, &sign->msg));
1312	else
1313	{
1314	readable_message_type *msgType = get_readable_message_type (sign);
1315	const char *somemsg = format ("%u %s", autoapply ? 1 : 0, &sign->msg);
1316	draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, somemsg, &sign->msg);
1317	}
1318	}	1274	}
1319	}	1275	}
1320		1276
1321	static void	1277	static void
1322	move_apply_hole (object *trap, object *victim)	1278	move_apply_hole (object *trap, object *victim)
…		…
1386		1342
1387	recursion_depth++;	1343	recursion_depth++;
1388	if (trap->head)	1344	if (trap->head)
1389	trap = trap->head;	1345	trap = trap->head;
1390		1346
1391	if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator)))	1347	if (!INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator)))
1392	goto leave;
1393
1394	switch (trap->type)	1348	switch (trap->type)
1395	{	1349	{
1396	case PLAYERMOVER:	1350	case PLAYERMOVER:
1397	if (trap->attacktype && (trap->level || victim->type != PLAYER) && !should_director_abort (trap, victim))	1351	if (trap->attacktype && (trap->level || victim->type != PLAYER) && !should_director_abort (trap, victim))
		1352	{
		1353	if (!trap->stats.maxsp)
		1354	trap->stats.maxsp = 2;
		1355
		1356	/* Is this correct? From the docs, it doesn't look like it
		1357	* should be divided by trap->speed
		1358	*/
		1359	victim->speed_left = -FABS (trap->stats.maxsp * victim->speed / trap->speed);
		1360
		1361	/* Just put in some sanity check. I think there is a bug in the
		1362	* above with some objects have zero speed, and thus the player
		1363	* getting permanently paralyzed.
		1364	*/
		1365	if (victim->speed_left < -50.f)
		1366	victim->speed_left = -50.f;
		1367	/* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */
		1368	}
		1369	break;
		1370
		1371	case SPINNER:
		1372	if (victim->direction)
		1373	{
		1374	victim->direction = absdir (victim->direction - trap->stats.sp);
		1375	update_turn_face (victim);
		1376	}
		1377	break;
		1378
		1379	case DIRECTOR:
		1380	if (victim->direction && !should_director_abort (trap, victim))
		1381	{
		1382	victim->direction = trap->stats.sp;
		1383	update_turn_face (victim);
		1384	}
		1385	break;
		1386
		1387	case BUTTON:
		1388	case PEDESTAL:
		1389	case T_MATCH:
		1390	update_button (trap, originator);
		1391	break;
		1392
		1393	case ALTAR:
		1394	/* sacrifice victim on trap */
		1395	apply_altar (trap, victim, originator);
		1396	break;
		1397
		1398	case THROWN_OBJ:
		1399	if (trap->inv == NULL)
		1400	break;
		1401	/* fallthrough */
		1402
		1403	case ARROW:
		1404	/* bad bug: monster throw a object, make a step forwards, step on object ,
		1405	* trigger this here and get hit by own missile - and will be own enemy.
		1406	* Victim then is his own enemy and will start to kill herself (this is
		1407	* removed) but we have not synced victim and his missile. To avoid senseless
		1408	* action, we avoid hits here
		1409	*/
		1410	if ((QUERY_FLAG (victim, FLAG_ALIVE) && trap->speed) && trap->owner != victim)
		1411	hit_with_arrow (trap, victim);
		1412	break;
		1413
		1414	case SPELL_EFFECT:
		1415	apply_spell_effect (trap, victim);
		1416	break;
		1417
		1418	case TRAPDOOR:
1398	{	1419	{
		1420	int max, sound_was_played;
		1421	object *ab, *ab_next;
		1422
1399	if (!trap->stats.maxsp)	1423	if (!trap->value)
1400	trap->stats.maxsp = 2;	1424	{
		1425	int tot;
1401		1426
1402	/* Is this correct? From the docs, it doesn't look like it	1427	for (ab = trap->above, tot = 0; ab; ab = ab->above)
1403	* should be divided by trap->speed	1428	if ((ab->move_type && trap->move_on) || ab->move_type == 0)
		1429	tot += ab->head_ ()->total_weight ();
		1430
		1431	if (!(trap->value = (tot > trap->weight) ? 1 : 0))
		1432	break;
		1433
		1434	SET_ANIMATION (trap, trap->value);
		1435	update_object (trap, UP_OBJ_FACE);
		1436	}
		1437
		1438	for (ab = trap->above, max = 100, sound_was_played = 0; --max && ab; ab = ab_next)
		1439	{
		1440	/* need to set this up, since if we do transfer the object,
		1441	* ab->above would be bogus
1404	*/	1442	*/
1405	victim->speed_left = -FABS (trap->stats.maxsp * victim->speed / trap->speed);	1443	ab_next = ab->above;
1406		1444
1407	/* Just put in some sanity check. I think there is a bug in the	1445	if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1408	* above with some objects have zero speed, and thus the player	1446	{
1409	* getting permanently paralyzed.	1447	if (!sound_was_played)
		1448	{
		1449	trap->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
		1450	sound_was_played = 1;
		1451	}
		1452
		1453	ab->statusmsg ("You fall into a trapdoor!", NDI_RED);
		1454	transfer_ob (ab, EXIT_X (trap), EXIT_Y (trap), 0, ab);
		1455	}
1410	*/	1456	}
1411	if (victim->speed_left < -50.f)	1457	break;
1412	victim->speed_left = -50.f;
1413	/* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */
1414	}	1458	}
1415	goto leave;
1416		1459
1417	case SPINNER:	1460	case CONVERTER:
1418	if (victim->direction)	1461	if (convert_item (victim, trap) < 0)
1419	{
1420	victim->direction = absdir (victim->direction - trap->stats.sp);
1421	update_turn_face (victim);
1422	}
1423	goto leave;
1424
1425	case DIRECTOR:
1426	if (victim->direction && !should_director_abort (trap, victim))
1427	{
1428	victim->direction = trap->stats.sp;
1429	update_turn_face (victim);
1430	}
1431	goto leave;
1432
1433	case BUTTON:
1434	case PEDESTAL:
1435	update_button (trap);
1436	goto leave;
1437
1438	case ALTAR:
1439	/* sacrifice victim on trap */
1440	apply_altar (trap, victim, originator);
1441	goto leave;
1442
1443	case THROWN_OBJ:
1444	if (trap->inv == NULL)
1445	goto leave;
1446	/* fallthrough */
1447
1448	case ARROW:
1449	/* bad bug: monster throw a object, make a step forwards, step on object ,
1450	* trigger this here and get hit by own missile - and will be own enemy.
1451	* Victim then is his own enemy and will start to kill herself (this is
1452	* removed) but we have not synced victim and his missile. To avoid senseless
1453	* action, we avoid hits here
1454	*/
1455	if ((QUERY_FLAG (victim, FLAG_ALIVE) && trap->speed) && trap->owner != victim)
1456	hit_with_arrow (trap, victim);
1457	goto leave;
1458
1459	case SPELL_EFFECT:
1460	apply_spell_effect (trap, victim);
1461	goto leave;
1462
1463	case TRAPDOOR:
1464	{
1465	int max, sound_was_played;
1466	object *ab, *ab_next;
1467
1468	if (!trap->value)
1469	{	1462	{
1470	int tot;	1463	originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1471		1464	archetype::get (shstr_burnout)->insert_at (trap, trap);
1472	for (ab = trap->above, tot = 0; ab; ab = ab->above)
1473	if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1474	tot += ab->head_ ()->total_weight ();
1475
1476	if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1477	goto leave;
1478
1479	SET_ANIMATION (trap, trap->value);
1480	update_object (trap, UP_OBJ_FACE);
1481	}	1465	}
1482		1466
1483	for (ab = trap->above, max = 100, sound_was_played = 0; --max && ab; ab = ab_next)	1467	break;
		1468
		1469	case TRIGGER_BUTTON:
		1470	case TRIGGER_PEDESTAL:
		1471	case TRIGGER_ALTAR:
		1472	check_trigger (trap, victim, originator);
		1473	break;
		1474
		1475	case DEEP_SWAMP:
		1476	walk_on_deep_swamp (trap, victim);
		1477	break;
		1478
		1479	case CHECK_INV:
		1480	check_inv (victim, trap);
		1481	break;
		1482
		1483	case HOLE:
		1484	move_apply_hole (trap, victim);
		1485	break;
		1486
		1487	case EXIT:
		1488	if (victim->type == PLAYER && EXIT_PATH (trap))
1484	{	1489	{
1485	/* need to set this up, since if we do transfer the object,	1490	/* Basically, don't show exits leading to random maps the
1486	* ab->above would be bogus	1491	* players output.
1487	*/	1492	*/
1488	ab_next = ab->above;	1493	if (trap->msg && !EXIT_PATH (trap).starts_with ("/!"))
		1494	victim->statusmsg (trap->msg, NDI_NAVY);
1489		1495
1490	if ((ab->move_type && trap->move_on) || ab->move_type == 0)	1496	trap->play_sound (trap->sound);
1491	{	1497	victim->enter_exit (trap);
1492	if (!sound_was_played)
1493	{
1494	trap->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1495	sound_was_played = 1;
1496	}
1497
1498	ab->statusmsg ("You fall into a trapdoor!", NDI_RED);
1499	transfer_ob (ab, EXIT_X (trap), EXIT_Y (trap), 0, ab);
1500	}
1501	}	1498	}
1502	goto leave;	1499	break;
1503	}
1504		1500
1505	case CONVERTER:
1506	if (convert_item (victim, trap) < 0)
1507	{
1508	originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1509	archetype::get (shstr_burnout)->insert_at (trap, trap);
1510	}
1511
1512	goto leave;
1513
1514	case TRIGGER_BUTTON:
1515	case TRIGGER_PEDESTAL:
1516	case TRIGGER_ALTAR:
1517	check_trigger (trap, victim);
1518	goto leave;
1519
1520	case DEEP_SWAMP:
1521	walk_on_deep_swamp (trap, victim);
1522	goto leave;
1523
1524	case CHECK_INV:
1525	check_inv (victim, trap);
1526	goto leave;
1527
1528	case HOLE:
1529	move_apply_hole (trap, victim);
1530	goto leave;
1531
1532	case EXIT:
1533	if (victim->type == PLAYER && EXIT_PATH (trap))
1534	{
1535	/* Basically, don't show exits leading to random maps the
1536	* players output.
1537	*/
1538	if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2))
1539	victim->statusmsg (trap->msg, NDI_NAVY);
1540
1541	trap->play_sound (trap->sound);
1542	victim->enter_exit (trap);
1543	}
1544	goto leave;
1545
1546	case ENCOUNTER:	1501	case ENCOUNTER:
1547	/* may be some leftovers on this */	1502	/* may be some leftovers on this */
1548	goto leave;	1503	break;
1549		1504
1550	case SHOP_MAT:	1505	case SHOP_MAT:
1551	apply_shop_mat (trap, victim);	1506	apply_shop_mat (trap, victim);
1552	goto leave;	1507	break;
1553		1508
1554	/* Drop a certain amount of gold, and have one item identified */	1509	/* Drop a certain amount of gold, and have one item identified */
1555	case IDENTIFY_ALTAR:	1510	case IDENTIFY_ALTAR:
1556	apply_id_altar (victim, trap, originator);	1511	apply_id_altar (victim, trap, originator);
1557	goto leave;	1512	break;
1558		1513
1559	case SIGN:	1514	case SIGN:
1560	if (victim->type != PLAYER && trap->stats.food > 0)	1515	if (victim->type != PLAYER && trap->stats.food > 0)
1561	goto leave; /* monsters musn't apply magic_mouths with counters */	1516	break; /* monsters musn't apply magic_mouths with counters */
1562		1517
1563	apply_sign (victim, trap, 1);	1518	apply_sign (victim, trap, 1);
1564	goto leave;	1519	break;
1565		1520
1566	case CONTAINER:	1521	case CONTAINER:
1567	apply_container (victim, trap);	1522	apply_container (victim, trap);
1568	goto leave;	1523	break;
1569		1524
1570	case RUNE:	1525	case RUNE:
1571	case TRAP:	1526	case TRAP:
1572	if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE))	1527	if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE))
1573	spring_trap (trap, victim);	1528	spring_trap (trap, victim);
1574	goto leave;	1529	break;
1575		1530
1576	default:	1531	default:
1577	LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not "	1532	LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not "
1578	"handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type);	1533	"handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type);
1579	goto leave;	1534	break;
1580	}	1535	}
1581		1536
1582	leave:
1583	recursion_depth--;	1537	recursion_depth--;
1584	}	1538	}
1585		1539
1586	/**	1540	/**
1587	* Handles reading a regular (ie not containing a spell) book.	1541	* Handles reading a regular (ie not containing a spell) book.
…		…
1598	return;	1552	return;
1599	}	1553	}
1600		1554
1601	if (!tmp->msg)	1555	if (!tmp->msg)
1602	{	1556	{
1603	op->failmsg (format ("You open the %s and find it empty.", &tmp->name));	1557	op->failmsg (format ("The %s contains nothing but meaningless gibberish. H<There is nothing interesting to read here.>", &tmp->name));
1604	return;	1558	return;
1605	}	1559	}
1606		1560
1607	/* need a literacy skill to read stuff! */	1561	/* need a literacy skill to read stuff! */
1608	skill_ob = find_skill_by_name (op, tmp->skill);	1562	skill_ob = find_skill_by_name (op, tmp->skill);
…		…
1626		1580
1627	readable_message_type *msgType = get_readable_message_type (tmp);	1581	readable_message_type *msgType = get_readable_message_type (tmp);
1628		1582
1629	if (player *pl = op->contr)	1583	if (player *pl = op->contr)
1630	if (client *ns = pl->ns)	1584	if (client *ns = pl->ns)
1631	if (ns->can_msg)
1632	pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n\n\n%s", (char *)long_desc (tmp, op), &tmp->msg));	1585	pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n%s", (char *)long_desc (tmp, op), &tmp->msg));
1633	else
1634	draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1635	msgType->message_type, msgType->message_subtype,
1636	"You open the %s and start reading.\n%s", (char *)"%s\n%s",
1637	long_desc (tmp, op), &tmp->msg);
1638		1586
1639	/* gain xp from reading */	1587	/* gain xp from reading */
1640	if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))	1588	if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1641	{ /* only if not read before */	1589	{ /* only if not read before */
1642	int exp_gain = calc_skill_exp (op, tmp, skill_ob);	1590	int exp_gain = calc_skill_exp (op, tmp, skill_ob);
…		…
1796	LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name);	1744	LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name);
1797	op->failmsg ("The spellbook symbols make no sense. This is a bug, please report!");	1745	op->failmsg ("The spellbook symbols make no sense. This is a bug, please report!");
1798	return;	1746	return;
1799	}	1747	}
1800		1748
1801	if (skop->level < int (sqrtf (spell->level) * 1.5f))	1749	int learn_level = sqrtf (spell->level) * 1.5f;
		1750	if (skop->level < learn_level)
1802	{	1751	{
1803	op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low.>", &tmp->skill));	1752	op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low, it must be at least %d.>",
		1753	&tmp->skill, learn_level));
1804	return;	1754	return;
1805	}	1755	}
1806		1756
1807	op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));	1757	op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));
1808		1758
…		…
1965	if (op->destroyed () || tmp->destroyed ())	1915	if (op->destroyed () || tmp->destroyed ())
1966	break;	1916	break;
1967	}	1917	}
1968		1918
1969	if (!tmp->destroyed () && !tmp->inv)	1919	if (!tmp->destroyed () && !tmp->inv)
1970	tmp->decrease ();	1920	tmp->decrease (true);
1971	}	1921	}
1972		1922
1973	/**	1923	/**
1974	* op eats food.	1924	* op eats food.
1975	* If player, takes care of messages and dragon special food.	1925	* If player, takes care of messages and dragon special food.
…		…
2170	op->statusmsg (buf);	2120	op->statusmsg (buf);
2171		2121
2172	/* now choose a winner if we have any */	2122	/* now choose a winner if we have any */
2173	i = -1;	2123	i = -1;
2174	if (winners > 0)	2124	if (winners > 0)
2175	i = atnr_winner[RANDOM () % winners];	2125	i = atnr_winner [rndm (winners)];
2176		2126
2177	if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)	2127	if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)
2178	{	2128	{
2179	/* resistance increased! */	2129	/* resistance increased! */
2180	skin->resist[i]++;	2130	skin->resist[i]++;
…		…
2355		2305
2356	return 0;	2306	return 0;
2357	}	2307	}
2358		2308
2359	/**	2309	/**
		2310	* This function will try to apply a lighter and in case no lighter
		2311	* is specified it will try to find a lighter in the players inventory,
		2312	* and inform him about this requirement.
		2313	*
		2314	* who - the player
		2315	* op - the item we want to light
		2316	* lighter - the lighter or 0 if a lighter has yet to be found
		2317	*/
		2318	static object *
		2319	auto_apply_lighter (object *who, object *op, object *lighter)
		2320	{
		2321	if (lighter == 0)
		2322	{
		2323	for (object *tmp = who->inv; tmp; tmp = tmp->below)
		2324	{
		2325	if (tmp->type == LIGHTER)
		2326	{
		2327	lighter = tmp;
		2328	break;
		2329	}
		2330	}
		2331
		2332	if (!lighter)
		2333	{
		2334	who->failmsg (format (
		2335	"You can't light up the %s with your bare hands! "
		2336	"H<You need a lighter in your inventory, for example a flint and steel.>",
		2337	&op->name));
		2338	return 0;
		2339	}
		2340	}
		2341
		2342	// last_eat == 0 means the lighter is not being used up!
		2343	if (lighter->last_eat && lighter->stats.food)
		2344	{
		2345	/* lighter gets used up */
		2346	lighter = lighter->split ();
		2347	lighter->stats.food--;
		2348	who->insert (lighter);
		2349	}
		2350	else if (lighter->last_eat)
		2351	{
		2352	/* no charges left in lighter */
		2353	who->failmsg (format (
		2354	"You attempt to light the %s with a used up %s.",
		2355	&op->name, &lighter->name));
		2356	return 0;
		2357	}
		2358
		2359	return lighter;
		2360	}
		2361
		2362	/**
		2363	* Designed primarily to light torches/lanterns/etc.
		2364	* Also burns up burnable material too. First object in the inventory is
		2365	* the selected object to "burn". -b.t.
		2366	*/
		2367	void
		2368	apply_lighter (object *who, object *lighter)
		2369	{
		2370	object *item;
		2371	int is_player_env = 0;
		2372
		2373	item = find_marked_object (who);
		2374	if (item)
		2375	{
		2376	if (!auto_apply_lighter (who, item, lighter))
		2377	return;
		2378
		2379	/* Perhaps we should split what we are trying to light on fire?
		2380	* I can't see many times when you would want to light multiple
		2381	* objects at once.
		2382	*/
		2383
		2384	save_throw_object (item, AT_FIRE, who);
		2385
		2386	if (item->destroyed ()
		2387	|| ((item->type == LAMP || item->type == TORCH)
		2388	&& item->glow_radius > 0))
		2389	who->statusmsg (format (
		2390	"You light the %s with the %s.",
		2391	&item->name, &lighter->name));
		2392	else
		2393	who->failmsg (format (
		2394	"You attempt to light the %s with the %s and fail.",
		2395	&item->name, &lighter->name));
		2396	}
		2397	else
		2398	who->failmsg ("You need to mark a lightable object.");
		2399	}
		2400
		2401	/**
		2402	* This function generates a cursed effect for cursed lamps and torches.
		2403	*/
		2404	void player_apply_lamp_cursed_effect (object *who, object *op)
		2405	{
		2406	if (op->level)
		2407	{
		2408	who->failmsg (format (
		2409	"The %s was cursed, it explodes in a big fireball!",
		2410	&op->name));
		2411	create_exploding_ball_at (who, op->level);
		2412	}
		2413	else
		2414	{
		2415	who->failmsg (format (
		2416	"The %s was cursed, it crumbles to dust, at least it didn't explode.!",
		2417	&op->name));
		2418	}
		2419
		2420	op->destroy ();
		2421	}
		2422
		2423	/**
		2424	* Apply for players and lamps
		2425	*
		2426	* who - the player
		2427	* op - the lamp
		2428	*/
		2429	void player_apply_lamp (object *who, object *op)
		2430	{
		2431	bool switch_on = op->glow_radius ? false : true;
		2432
		2433	if (switch_on)
		2434	{
		2435	object *lighter = 0;
		2436
		2437	if (op->flag [FLAG_IS_LIGHTABLE]
		2438	&& !(lighter = auto_apply_lighter (who, op, 0)))
		2439	return;
		2440
		2441	if (op->stats.food < 1)
		2442	{
		2443	if (op->type == LAMP)
		2444	who->failmsg (format (
		2445	"The %s is out of fuel! "
		2446	"H<Lamps and similar items need fuel. They cannot be refilled.>",
		2447	&op->name));
		2448	else
		2449	who->failmsg (format (
		2450	"The %s is burnt out! "
		2451	"H<Torches and similar items burn out and become worthless.>",
		2452	&op->name));
		2453	return;
		2454	}
		2455
		2456	if (op->flag [FLAG_CURSED])
		2457	{
		2458	player_apply_lamp_cursed_effect (who, op);
		2459	return;
		2460	}
		2461
		2462	if (lighter)
		2463	who->statusmsg (format (
		2464	"You light up the %s with the %s.", &op->name, &lighter->name));
		2465	else
		2466	who->statusmsg (format ("You light up the %s.", &op->name));
		2467	}
		2468	else
		2469	{
		2470	if (op->flag [FLAG_CURSED])
		2471	{
		2472	player_apply_lamp_cursed_effect (who, op);
		2473	return;
		2474	}
		2475
		2476	if (op->type == TORCH)
		2477	{
		2478	if (!op->flag [FLAG_IS_LIGHTABLE])
		2479	{
		2480	who->statusmsg (format (
		2481	"You put out the %s. "
		2482	"H<The %s can't be used anymore, as it can't be lighted up again.>",
		2483	&op->name, &op->name));
		2484	}
		2485	else
		2486	who->statusmsg (format (
		2487	"You put out the %s."
		2488	"H<Torches wear out if you put them out.>",
		2489	&op->name));
		2490	}
		2491	else
		2492	who->statusmsg (format ("You turn off the %s.", &op->name));
		2493	}
		2494
		2495	apply_lamp (op, switch_on);
		2496	}
		2497
		2498	void get_animation_from_arch (object *op, arch_ptr a)
		2499	{
		2500	op->animation_id = a->animation_id;
		2501	op->flag [FLAG_IS_TURNABLE] = a->flag [FLAG_IS_TURNABLE];
		2502	op->flag [FLAG_ANIMATE] = a->flag [FLAG_ANIMATE];
		2503	op->anim_speed = a->anim_speed;
		2504	op->last_anim = 0;
		2505	op->state = 0;
		2506	op->face = a->face;
		2507
		2508	if (NUM_ANIMATIONS(op) > 1)
		2509	{
		2510	SET_ANIMATION(op, 0);
		2511	animate_object (op, op->direction);
		2512	}
		2513	else
		2514	update_object (op, UP_OBJ_FACE);
		2515	}
		2516
		2517	/**
		2518	* Apply for LAMPs and TORCHes.
		2519	*
		2520	* op - the lamp
		2521	* switch_on - a flag which says whether the lamp should be switched on or off
		2522	*/
		2523	void apply_lamp (object *op, bool switch_on)
		2524	{
		2525	op->set_glow_radius (switch_on ? op->range : 0);
		2526	op->set_speed (switch_on ? op->arch->speed : 0);
		2527
		2528	// torches wear out if you put them out
		2529	if (op->type == TORCH && !switch_on)
		2530	{
		2531	if (op->flag [FLAG_IS_LIGHTABLE])
		2532	{
		2533	op->stats.food -= (double) op->arch->stats.food / 15;
		2534	if (op->stats.food < 0)
		2535	op->stats.food = 0;
		2536	}
		2537	else
		2538	op->stats.food = 0;
		2539	}
		2540
		2541	// lamps and torched get worthless when used up
		2542	if (op->stats.food <= 0)
		2543	op->value = 0;
		2544
		2545	// FIXME: This is a hack to make the more sane torches and lamps
		2546	// still animated ;-/
		2547	if (op->other_arch)
		2548	get_animation_from_arch (op, switch_on ? op->other_arch : op->arch);
		2549
		2550	if (object *pl = op->visible_to ())
		2551	esrv_update_item (UPD_ANIM | UPD_FACE | UPD_NAME, pl, op);
		2552	}
		2553
		2554	/**
2360	* Main apply handler.	2555	* Main apply handler.
2361	*	2556	*
2362	* Checks for unpaid items before applying.	2557	* Checks for unpaid items before applying.
2363	*	2558	*
2364	* Return value:	2559	* Return value:
2365	* 0: player or monster can't apply objects of that type	2560	* 0: player or monster can't apply objects of that type
2366	* 1: has been applied, or there was an error applying the object	2561	* 1: has been applied, or there was an error applying the object
2367	* 2: objects of that type can't be applied if not in inventory	2562	* 2: objects of that type can't be applied if not in inventory
2368	*	2563	*
2369	* op is the object that is causing object to be applied, tmp is the object	2564	* who is the object that is causing object to be applied, op is the object
2370	* being applied.	2565	* being applied.
2371	*	2566	*
2372	* aflag is special (always apply/unapply) flags. Nothing is done with	2567	* aflag is special (always apply/unapply) flags. Nothing is done with
2373	* them in this function - they are passed to apply_special	2568	* them in this function - they are passed to apply_special
2374	*/	2569	*/
2375	int	2570	int
2376	manual_apply (object *op, object *tmp, int aflag)	2571	manual_apply (object *who, object *op, int aflag)
2377	{	2572	{
2378	tmp = tmp->head_ ();	2573	op = op->head_ ();
2379		2574
2380	if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED))	2575	if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
2381	{	2576	{
2382	if (op->type == PLAYER)	2577	if (who->type == PLAYER)
2383	{	2578	{
		2579	examine (who, op);
2384	op->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>");	2580	//who->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>");//TODO remove
2385	return 1;	2581	return 1;
2386	}	2582	}
2387	else	2583	else
2388	return 0; /* monsters just skip unpaid items */	2584	return 0; /* monsters just skip unpaid items */
2389	}	2585	}
2390		2586
2391	if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op)))	2587	if (INVOKE_OBJECT (APPLY, op, ARG_OBJECT (who)))
2392	return RESULT_INT (0);	2588	return RESULT_INT (0);
2393		2589
2394	switch (tmp->type)	2590	switch (op->type)
2395	{	2591	{
2396	case CF_HANDLE:	2592	case T_HANDLE:
2397	op->play_sound (sound_find ("turn_handle"));	2593	who->play_sound (sound_find ("turn_handle"));
2398	op->statusmsg ("You turn the handle.");	2594	who->statusmsg ("You turn the handle.");
2399	tmp->value = tmp->value ? 0 : 1;	2595	op->value = op->value ? 0 : 1;
2400	SET_ANIMATION (tmp, tmp->value);	2596	SET_ANIMATION (op, op->value);
2401	update_object (tmp, UP_OBJ_FACE);	2597	update_object (op, UP_OBJ_FACE);
2402	push_button (tmp);	2598	push_button (op, who);
2403	return 1;	2599	return 1;
2404		2600
2405	case TRIGGER:	2601	case TRIGGER:
2406	if (check_trigger (tmp, op))	2602	if (check_trigger (op, who, who))
2407	{	2603	{
2408	op->statusmsg ("You turn the handle.");	2604	who->statusmsg ("You turn the handle.");
2409	op->play_sound (sound_find ("turn_handle"));	2605	who->play_sound (sound_find ("turn_handle"));
2410	}	2606	}
2411	else	2607	else
2412	op->failmsg ("The handle doesn't move.");	2608	who->failmsg ("The handle doesn't move.");
2413		2609
2414	return 1;	2610	return 1;
2415		2611
2416	case EXIT:	2612	case EXIT:
2417	if (op->type != PLAYER)	2613	if (who->type != PLAYER)
2418	return 0;	2614	return 0;
2419		2615
2420	if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp))	2616	if (!EXIT_PATH (op) || !is_legal_2ways_exit (who, op))
2421	op->failmsg (format ("The %s is closed.", query_name (tmp)));	2617	who->failmsg (format ("The %s is closed. H<And will stay closed, until somebody fires up the map editor and adds it.>", query_name (op)));
2422	else	2618	else
2423	{	2619	{
2424	/* Don't display messages for random maps. */	2620	/* Don't display messages for random maps. */
2425	if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2))	2621	if (op->msg && !EXIT_PATH (op).starts_with ("/!"))
2426	op->statusmsg (tmp->msg, NDI_NAVY);	2622	who->statusmsg (op->msg, NDI_NAVY);
2427		2623
2428	op->enter_exit (tmp);	2624	who->enter_exit (op);
2429	}	2625	}
2430		2626
2431	return 1;	2627	return 1;
2432		2628
2433	case INSCRIBABLE:	2629	case INSCRIBABLE:
2434	op->statusmsg (tmp->msg);	2630	who->statusmsg (op->msg);
2435	// maybe show a spell menu to chose from or something like that	2631	// maybe show a spell menu to chose from or something like that
2436	return 1;	2632	return 1;
2437		2633
2438	case SIGN:	2634	case SIGN:
2439	apply_sign (op, tmp, 0);	2635	apply_sign (who, op, 0);
2440	return 1;	2636	return 1;
2441		2637
2442	case BOOK:	2638	case BOOK:
2443	if (op->type == PLAYER)	2639	if (who->type == PLAYER)
2444	{	2640	{
2445	apply_book (op, tmp);	2641	apply_book (who, op);
2446	return 1;	2642	return 1;
2447	}	2643	}
2448	else	2644	else
2449	return 0;	2645	return 0;
2450		2646
2451	case SKILLSCROLL:	2647	case SKILLSCROLL:
2452	if (op->type == PLAYER)	2648	if (who->type == PLAYER)
2453	{	2649	{
2454	apply_skillscroll (op, tmp);	2650	apply_skillscroll (who, op);
2455	return 1;	2651	return 1;
2456	}	2652	}
2457	else	2653	else
2458	return 0;	2654	return 0;
2459		2655
2460	case SPELLBOOK:	2656	case SPELLBOOK:
2461	if (op->type == PLAYER)	2657	if (who->type == PLAYER)
2462	{	2658	{
2463	apply_spellbook (op, tmp);	2659	apply_spellbook (who, op);
2464	return 1;	2660	return 1;
2465	}	2661	}
2466	else	2662	else
2467	return 0;	2663	return 0;
2468		2664
2469	case SCROLL:	2665	case SCROLL:
2470	apply_scroll (op, tmp, 0);	2666	apply_scroll (who, op, 0);
2471	return 1;	2667	return 1;
2472		2668
2473	case POTION:	2669	case POTION:
2474	apply_potion (op, tmp);	2670	apply_potion (who, op);
2475	return 1;	2671	return 1;
2476		2672
2477	/* Eneq(@csd.uu.se): Handle apply on containers. */	2673	/* Eneq(@csd.uu.se): Handle apply on containers. */
2478	//TODO: remove, as it is unsed?	2674	//TODO: remove, as it is unsed?
2479	case CLOSE_CON:	2675	case CLOSE_CON:
2480	apply_container (op, tmp->env);	2676	apply_container (who, op->env);
2481	return 1;	2677	return 1;
2482		2678
2483	case CONTAINER:	2679	case CONTAINER:
2484	apply_container (op, tmp);	2680	apply_container (who, op);
2485	return 1;	2681	return 1;
2486		2682
2487	case TREASURE:	2683	case TREASURE:
2488	if (op->type == PLAYER)	2684	if (who->type == PLAYER)
2489	{	2685	{
2490	apply_treasure (op, tmp);	2686	apply_treasure (who, op);
2491	return 1;	2687	return 1;
2492	}	2688	}
2493	else	2689	else
2494	return 0;	2690	return 0;
		2691
		2692	case LAMP:
		2693	case TORCH:
		2694	player_apply_lamp (who, op);
		2695	return 1;
2495		2696
2496	case WEAPON:	2697	case WEAPON:
2497	case ARMOUR:	2698	case ARMOUR:
2498	case BOOTS:	2699	case BOOTS:
2499	case GLOVES:	2700	case GLOVES:
…		…
2507	case WAND:	2708	case WAND:
2508	case ROD:	2709	case ROD:
2509	case HORN:	2710	case HORN:
2510	case SKILL:	2711	case SKILL:
2511	case BOW:	2712	case BOW:
2512	case LAMP:
2513	case BUILDER:	2713	case BUILDER:
2514	case SKILL_TOOL:	2714	case SKILL_TOOL:
2515	if (tmp->env != op)	2715	if (op->env != who)
2516	return 2; /* not in inventory */	2716	return 2; /* not in inventory */
2517		2717
2518	apply_special (op, tmp, aflag);	2718	apply_special (who, op, aflag);
2519	return 1;	2719	return 1;
2520		2720
2521	case DRINK:	2721	case DRINK:
2522	case FOOD:	2722	case FOOD:
2523	case FLESH:	2723	case FLESH:
2524	apply_food (op, tmp);	2724	apply_food (who, op);
2525	return 1;	2725	return 1;
2526		2726
2527	case POISON:	2727	case POISON:
2528	apply_poison (op, tmp);	2728	apply_poison (who, op);
2529	return 1;	2729	return 1;
2530		2730
2531	case SAVEBED:	2731	case SAVEBED:
2532	return 1;	2732	return 1;
2533		2733
2534	case ARMOUR_IMPROVER:	2734	case ARMOUR_IMPROVER:
2535	if (op->type == PLAYER)	2735	if (who->type == PLAYER)
2536	{	2736	{
2537	apply_armour_improver (op, tmp);	2737	apply_armour_improver (who, op);
2538	return 1;	2738	return 1;
2539	}	2739	}
2540	else	2740	else
2541	return 0;	2741	return 0;
2542		2742
2543	case WEAPON_IMPROVER:	2743	case WEAPON_IMPROVER:
2544	check_improve_weapon (op, tmp);	2744	check_improve_weapon (who, op);
2545	return 1;	2745	return 1;
2546		2746
2547	case CLOCK:	2747	case CLOCK:
2548	if (op->type == PLAYER)	2748	if (who->type == PLAYER)
2549	{	2749	{
2550	char buf[MAX_BUF];	2750	char buf[MAX_BUF];
2551	timeofday_t tod;	2751	timeofday_t tod;
2552		2752
2553	get_tod (&tod);	2753	get_tod (&tod);
2554	op->play_sound (sound_find ("sound_clock"));	2754	who->play_sound (sound_find ("sound_clock"));
2555	op->statusmsg (format (	2755	who->statusmsg (format (
2556	"It is %d minute%s past %d o'clock %s",	2756	"It is %d minute%s past %d o'clock %s",
2557	tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),	2757	tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),
2558	((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")	2758	((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")
2559	));	2759	));
2560	return 1;	2760	return 1;
2561	}	2761	}
2562	else	2762	else
2563	return 0;	2763	return 0;
2564		2764
2565	case MENU:	2765	case MENU:
2566	if (op->type == PLAYER)	2766	if (who->type == PLAYER)
2567	{	2767	{
2568	shop_listing (tmp, op);	2768	shop_listing (op, who);
2569	return 1;	2769	return 1;
2570	}	2770	}
2571	else	2771	else
2572	return 0;	2772	return 0;
2573		2773
2574	case POWER_CRYSTAL:	2774	case POWER_CRYSTAL:
2575	apply_power_crystal (op, tmp); /* see egoitem.c */	2775	apply_power_crystal (who, op); /* see egoitem.c */
2576	return 1;	2776	return 1;
2577		2777
2578	case LIGHTER: /* for lighting torches/lanterns/etc */	2778	case LIGHTER: /* for lighting torches/lanterns/etc */
2579	if (op->type == PLAYER)	2779	if (who->type == PLAYER)
2580	{	2780	{
2581	apply_lighter (op, tmp);	2781	apply_lighter (who, op);
2582	return 1;	2782	return 1;
2583	}	2783	}
2584	else	2784	else
2585	return 0;	2785	return 0;
2586		2786
2587	case ITEM_TRANSFORMER:	2787	case ITEM_TRANSFORMER:
2588	apply_item_transformer (op, tmp);	2788	apply_item_transformer (who, op);
2589	return 1;	2789	return 1;
2590		2790
2591	default:	2791	default:
2592	return 0;	2792	return 0;
2593	}	2793	}
…		…
2645	* we don't use a corrupt pointer for the next object, so we get the	2845	* we don't use a corrupt pointer for the next object, so we get the
2646	* next object in the stack before applying. This is can only be a	2846	* next object in the stack before applying. This is can only be a
2647	* problem if player_apply() has a bug in that it uses the object but does	2847	* problem if player_apply() has a bug in that it uses the object but does
2648	* not return a proper value.	2848	* not return a proper value.
2649	*/	2849	*/
2650	for (object *next, *tmp = pl->container ? pl->container->inv : pl->below; tmp; tmp = next)	2850	for (object *next, *tmp = pl->container_ () ? pl->container_ ()->inv : pl->below; tmp; tmp = next)
2651	{	2851	{
2652	next = tmp->below;	2852	next = tmp->below;
2653		2853
2654	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	2854	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
2655	floors++;	2855	floors++;
…		…
2660	* person moving on it, also activate. Added code to make it	2860	* person moving on it, also activate. Added code to make it
2661	* so that at least one of players movement types be that which	2861	* so that at least one of players movement types be that which
2662	* the item needs.	2862	* the item needs.
2663	*/	2863	*/
2664	if (!tmp->invisible || (tmp->move_on & pl->move_type))	2864	if (!tmp->invisible || (tmp->move_on & pl->move_type))
2665	{
2666	if (player_apply (pl, tmp, 0, 1) == 1)	2865	if (player_apply (pl, tmp, 0, 1) == 1)
2667	return;	2866	return;
2668	}	2867
2669	if (floors >= 2)	2868	if (floors >= 2)
2670	return; /* process at most two floor objects */	2869	return; /* process at most two floor objects */
2671	}	2870	}
2672	}	2871	}
2673		2872
…		…
2745	case BRACERS:	2944	case BRACERS:
2746	case CLOAK:	2945	case CLOAK:
2747	who->statusmsg (format ("You unwear %s.", query_name (op)));	2946	who->statusmsg (format ("You unwear %s.", query_name (op)));
2748	change_abil (who, op);	2947	change_abil (who, op);
2749	break;	2948	break;
2750
2751	case LAMP:
2752	{
2753	who->statusmsg (format ("You turn off your %s.", &op->name));
2754
2755	object *tmp2 = arch_to_object (op->other_arch);
2756	tmp2->x = op->x;
2757	tmp2->y = op->y;
2758	tmp2->map = op->map;
2759	tmp2->below = op->below;
2760	tmp2->above = op->above;
2761	tmp2->stats.food = op->stats.food;
2762	CLEAR_FLAG (tmp2, FLAG_APPLIED);
2763
2764	if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2765	SET_FLAG (tmp2, FLAG_INV_LOCKED);
2766
2767	op->destroy ();
2768	who->insert (tmp2);
2769	who->update_stats ();
2770
2771	if (who->contr)
2772	{
2773	if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2774	{
2775	who->failmsg ("Oops, it feels deadly cold!");
2776	SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2777	}
2778	}
2779	}
2780
2781	return 1; /* otherwise, an attempt to drop causes problems */
2782		2949
2783	case BOW:	2950	case BOW:
2784	case WAND:	2951	case WAND:
2785	case ROD:	2952	case ROD:
2786	case HORN:	2953	case HORN:
…		…
3194	* skill so that the dam and wc get updated	3361	* skill so that the dam and wc get updated
3195	*/	3362	*/
3196	who->change_skill (skop);	3363	who->change_skill (skop);
3197	}	3364	}
3198		3365
3199	if (who->type == PLAYER	3366	if (!check_item_power (who, op->item_power))
3200	&& op->item_power
3201	&& op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3202	{	3367	{
3203	who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER);	3368	who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER);
3204	return 1;	3369	return 1;
3205	}	3370	}
3206		3371
…		…
3214	return RESULT_INT (0);	3379	return RESULT_INT (0);
3215		3380
3216	switch (op->type)	3381	switch (op->type)
3217	{	3382	{
3218	case WEAPON:	3383	case WEAPON:
3219	if (!check_weapon_power (who, op->last_eat))
3220	{
3221	op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3222
3223	if (tmp)
3224	insert_ob_in_ob (tmp, who);
3225
3226	return 1;
3227	}
3228
3229	//TODO: this obviously fails for players using a shorter prefix	3384	//TODO: this obviously fails for players using a shorter prefix
3230	// i.e. "R" can use Ragnarok's sword.	3385	// i.e. "R" can use Ragnarok's sword.
3231	if (op->level && (strncmp (op->name, who->name, strlen (who->name))))	3386	if (op->level && !op->name.starts_with (who->name))
3232	{	3387	{
3233	/* if the weapon does not have the name as the character, can't use it. */	3388	/* if the weapon does not have the name as the character, can't use it. */
3234	/* (Ragnarok's sword attempted to be used by Foo: won't work) */	3389	/* (Ragnarok's sword attempted to be used by Foo: won't work) */
3235	who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>");	3390	who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>");
3236		3391
…		…
3270	case AMULET:	3425	case AMULET:
3271	SET_FLAG (op, FLAG_APPLIED);	3426	SET_FLAG (op, FLAG_APPLIED);
3272	who->statusmsg (format ("You wear %s.", query_name (op)));	3427	who->statusmsg (format ("You wear %s.", query_name (op)));
3273	change_abil (who, op);	3428	change_abil (who, op);
3274	break;	3429	break;
3275
3276	case LAMP:
3277	if (op->stats.food < 1)
3278	{
3279	who->failmsg (format (
3280	"Your %s is out of fuel! "
3281	"H<Lamps and similar items need fuel. They cannot be refilled.>",
3282	&op->name
3283	));
3284	return 1;
3285	}
3286
3287	who->statusmsg (format ("You turn on your %s.", &op->name));
3288
3289	tmp2 = arch_to_object (op->other_arch);
3290	tmp2->stats.food = op->stats.food;
3291	SET_FLAG (tmp2, FLAG_APPLIED);
3292
3293	if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3294	SET_FLAG (tmp2, FLAG_INV_LOCKED);
3295
3296	who->insert (tmp2);
3297
3298	/* Remove the old lantern */
3299	op->destroy ();
3300
3301	/* insert the portion that was split off */
3302	if (tmp)
3303	who->insert (tmp);
3304
3305	who->update_stats ();
3306
3307	if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3308	if (who->type == PLAYER)
3309	{
3310	who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
3311	SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3312	}
3313
3314	return 0;
3315		3430
3316	case SKILL_TOOL:	3431	case SKILL_TOOL:
3317	// applying a skill tool also readies the skill	3432	// applying a skill tool also readies the skill
3318	SET_FLAG (op, FLAG_APPLIED);	3433	SET_FLAG (op, FLAG_APPLIED);
3319		3434
…		…
3399	}	3514	}
3400		3515
3401	break;	3516	break;
3402		3517
3403	case BOW:	3518	case BOW:
3404	if (!check_weapon_power (who, op->last_eat))	3519	if (op->level && !op->name.starts_with (who->name))
3405	{
3406	who->failmsg ("That weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3407
3408	if (tmp)
3409	insert_ob_in_ob (tmp, who);
3410
3411	return 1;
3412	}
3413
3414	if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3415	{	3520	{
3416	who->failmsg ("The weapon does not recognize you as its owner. "	3521	who->failmsg ("The weapon does not recognize you as its owner. "
3417	"H<Its name indicates that it belongs to somebody else.>");	3522	"H<Its name indicates that it belongs to somebody else.>");
3418	if (tmp)	3523	if (tmp)
3419	insert_ob_in_ob (tmp, who);	3524	insert_ob_in_ob (tmp, who);
…		…
3493	if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))	3598	if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3494	if (who->type == PLAYER)	3599	if (who->type == PLAYER)
3495	{	3600	{
3496	who->failmsg (	3601	who->failmsg (
3497	"Oops, it feels deadly cold! "	3602	"Oops, it feels deadly cold! "
3498	"H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>"	3603	"H<Maybe it wasn't such a bright idea to apply this cursed or damned item.>"
3499	);	3604	);
3500	SET_FLAG (op, FLAG_KNOWN_CURSED);	3605	SET_FLAG (op, FLAG_KNOWN_CURSED);
3501	}	3606	}
3502		3607
3503	if (object *pl = op->visible_to ())	3608	if (object *pl = op->visible_to ())
…		…
3572	/* If we generated an object and put it in this object inventory,	3677	/* If we generated an object and put it in this object inventory,
3573	* move it to the parent object as the current object is about	3678	* move it to the parent object as the current object is about
3574	* to disappear. An example of this item is the random_* stuff	3679	* to disappear. An example of this item is the random_* stuff
3575	* that is put inside other objects.	3680	* that is put inside other objects.
3576	*/	3681	*/
3577	for (tmp = op->inv; tmp; tmp = tmp2)
3578	{
3579	tmp2 = tmp->below;
3580	tmp->remove ();
3581
3582	if (op->env)	3682	if (op->env)
3583	insert_ob_in_ob (tmp, op->env);	3683	while (op->inv)
3584	else	3684	op->env->insert (op->inv);
3585	tmp->destroy ();
3586	}
3587		3685
3588	op->destroy ();	3686	op->destroy ();
3589	break;	3687	break;
3590	}	3688	}
3591		3689
…		…
3690	}	3788	}
3691		3789
3692	for (mapspace *ms = spaces + size (); ms-- > spaces; )	3790	for (mapspace *ms = spaces + size (); ms-- > spaces; )
3693	for (object *tmp = ms->bot; tmp; tmp = tmp->above)	3791	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
3694	if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL))	3792	if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL))
3695	check_trigger (tmp, tmp->above);	3793	check_trigger (tmp, tmp->above, tmp->above);
3696	}	3794	}
3697		3795
3698	/**	3796	/**
3699	* Handles player eating food that temporarily changes status (resistances, stats).	3797	* Handles player eating food that temporarily changes status (resistances, stats).
3700	* This used to call cast_change_attr(), but	3798	* This used to call cast_change_attr(), but
…		…
3705	eat_special_food (object *who, object *food)	3803	eat_special_food (object *who, object *food)
3706	{	3804	{
3707	object *force;	3805	object *force;
3708	int i, did_one = 0;	3806	int i, did_one = 0;
3709		3807
3710	force = get_archetype (FORCE_NAME);	3808	char buf[64];
		3809	snprintf (buf, sizeof(buf), "sp_food_%s", &food->title);
		3810	shstr key (buf);
3711		3811
3712	for (i = 0; i < NUM_STATS; i++)
3713	if (sint8 k = food->stats.stat (i))
3714	{
3715	force->stats.stat (i) = k;
3716	did_one = 1;
3717	}
3718
3719	/* check if we can protect the eater */
3720	for (i = 0; i < NROFATTACKS; i++)
3721	{
3722	if (food->resist[i] > 0)
3723	{
3724	force->resist[i] = food->resist[i] / 2;
3725	did_one = 1;
3726	}
3727	}
3728
3729	if (did_one)
3730	{
3731	force->set_speed (0.1);
3732	/* bigger morsel of food = longer effect time */	3812	/* bigger morsel of food = longer effect time */
3733	force->duration = food->stats.food / 5;	3813	int duration = TIME2TICK (food->stats.food);
3734	SET_FLAG (force, FLAG_APPLIED);	3814
3735	change_abil (who, force);	3815	if (force = who->force_find (key))
3736	insert_ob_in_ob (force, who);	3816	{
		3817	if (duration > abs (force->speed_left / force->speed))
		3818	{
		3819	new_draw_info_format (NDI_UNIQUE, 0, who, "More magical force spreads through you. H<The effect will last for about %.10g more seconds.>", TICK2TIME (duration));
		3820	force->force_set_timer (duration);
		3821	}
		3822	else
		3823	new_draw_info (NDI_UNIQUE, 0, who, "It had no additional effect.");
		3824
		3825	return;
3737	}	3826	}
3738	else	3827	else
		3828	{
		3829	force = who->force_add (key, duration);
		3830	force->name = key;
		3831
		3832	/* check if the food affects a stat */
		3833	for (i = 0; i < NUM_STATS; i++)
		3834	if (sint8 k = food->stats.stat (i))
		3835	{
		3836	force->stats.stat (i) = k;
		3837	did_one = 1;
		3838	}
		3839
		3840	/* check if we can protect the eater */
		3841	for (i = 0; i < NROFATTACKS; i++)
		3842	{
		3843	if (food->resist[i] > 0)
		3844	{
		3845	force->resist[i] = food->resist[i];
		3846	did_one = 1;
		3847	}
		3848	}
		3849
		3850	if (did_one)
		3851	{
		3852	new_draw_info_format (NDI_UNIQUE, 0, who, "You are suffused with magical force. H<The effect will last for about %.10g seconds.>", TICK2TIME (duration));
		3853
		3854	/* make the force take effect and report effects to user */
		3855	change_abil (who, force);
		3856	}
		3857	else
3739	force->destroy ();	3858	force->destroy ();
		3859	}
3740		3860
3741	/* check for hp, sp change */	3861	/* check for hp, sp change */
3742	if (food->stats.hp != 0)	3862	if (food->stats.hp != 0)
3743	{	3863	{
3744	if (QUERY_FLAG (food, FLAG_CURSED))	3864	if (QUERY_FLAG (food, FLAG_CURSED))
…		…
3776	}	3896	}
3777		3897
3778	who->update_stats ();	3898	who->update_stats ();
3779	}	3899	}
3780		3900
3781	/**
3782	* Designed primarily to light torches/lanterns/etc.
3783	* Also burns up burnable material too. First object in the inventory is
3784	* the selected object to "burn". -b.t.
3785	*/
3786	void
3787	apply_lighter (object *who, object *lighter)
3788	{
3789	object *item;
3790	int is_player_env = 0;
3791
3792	item = find_marked_object (who);
3793	if (item)
3794	{
3795	if (lighter->last_eat && lighter->stats.food)
3796	{ /* lighter gets used up */
3797	object *oneLighter = lighter->split ();
3798	oneLighter->stats.food--;
3799	who->insert (oneLighter);
3800	}
3801	else if (lighter->last_eat)
3802	{
3803	/* no charges left in lighter */
3804	who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name));
3805	return;
3806	}
3807
3808	/* Perhaps we should split what we are trying to light on fire?
3809	* I can't see many times when you would want to light multiple
3810	* objects at once.
3811	*/
3812
3813	if (who == item->in_player ())
3814	is_player_env = 1;
3815
3816	save_throw_object (item, AT_FIRE, who);
3817
3818	if (item->destroyed ())
3819	{
3820	who->statusmsg (format ("You light the %s with the %s.", &item->name, &lighter->name));
3821	/* Need to update the player so that the players glow radius
3822	* gets changed.
3823	*/
3824	if (is_player_env)
3825	who->update_stats ();
3826	}
3827	else
3828	who->failmsg (format ("You attempt to light the %s with the %s and fail.", &item->name, &lighter->name));
3829	}
3830	else
3831	who->failmsg ("You need to mark a lightable object.");
3832	}
3833		3901
3834	/**	3902	/**
3835	* op made some mistake with a scroll, this takes care of punishment.	3903	* op made some mistake with a scroll, this takes care of punishment.
3836	* scroll_failure()- hacked directly from spell_failure	3904	* scroll_failure()- hacked directly from spell_failure
3837	*/	3905	*/
…		…
3937	}	4005	}
3938		4006
3939	/* insert the randomitems from the change's treasurelist into	4007	/* insert the randomitems from the change's treasurelist into
3940	* the player ref: player.c	4008	* the player ref: player.c
3941	*/	4009	*/
3942	if (change->randomitems != NULL)	4010	if (change->randomitems)
3943	give_initial_items (pl, change->randomitems);	4011	give_initial_items (pl, change->randomitems);
3944		4012
3945	/* set up the face, for some races. */	4013	/* set up the face, for some races. */
3946		4014
3947	/* first, look for the force object banning	4015	/* first, look for the force object banning
3948	* changing the face. Certain races never change face with class.	4016	* changing the face. Certain races never change face with class.
3949	*/	4017	*/
3950	for (walk = pl->inv; walk != NULL; walk = walk->below)	4018	for (walk = pl->inv; walk; walk = walk->below)
3951	if (!strcmp (walk->name, "NOCLASSFACECHANGE"))	4019	if (walk->name == shstr_NOCLASSFACECHANGE)
3952	flag_change_face = 0;	4020	flag_change_face = 0;
3953		4021
3954	if (flag_change_face)	4022	if (flag_change_face)
3955	{	4023	{
3956	pl->face = change->face;	4024	pl->face = change->face;
…		…
3958	pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE];	4026	pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE];
3959	}	4027	}
3960		4028
3961	/* check the special case of can't use weapons */	4029	/* check the special case of can't use weapons */
3962	/*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */	4030	/*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */
3963	if (!strcmp (change->name, "monk"))	4031	if (change->name == shstr_monk)
3964	CLEAR_FLAG (pl, FLAG_USE_WEAPON);	4032	CLEAR_FLAG (pl, FLAG_USE_WEAPON);
3965		4033
3966	break;	4034	break;
3967	}	4035	}
3968	}	4036	}
…		…
4005	pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));	4073	pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
4006	return;	4074	return;
4007	}	4075	}
4008		4076
4009	/* check whether they are compatible or not */	4077	/* check whether they are compatible or not */
4010	find = strstr (marked->slaying, transformer->arch->archname);	4078	find = strstr (&marked->slaying, transformer->arch->archname);
4011	if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))	4079	if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
4012	{	4080	{
4013	pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));	4081	pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
4014	return;	4082	return;
4015	}	4083	}

Diff Legend

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