ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/server/attack.C

Comparing deliantra/server/server/attack.C (file contents):
Revision 1.15 by root, Thu Sep 14 20:46:10 2006 UTC vs.
Revision 1.83 by root, Wed Apr 30 06:40:28 2008 UTC

1
2	/*	1	/*
3	* static char *rcsid_attack_c =	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
4	* "$Id: attack.C,v 1.15 2006/09/14 20:46:10 root Exp $";	3	*
		4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
		5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
		6	* Copyright (©) 1992,2007 Frank Tore Johansen
		7	*
		8	* Deliantra is free software: you can redistribute it and/or modify
		9	* it under the terms of the GNU General Public License as published by
		10	* the Free Software Foundation, either version 3 of the License, or
		11	* (at your option) any later version.
		12	*
		13	* This program is distributed in the hope that it will be useful,
		14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
		15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		16	* GNU General Public License for more details.
		17	*
		18	* You should have received a copy of the GNU General Public License
		19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
		20	*
		21	* The authors can be reached via e-mail to <support@deliantra.net>
5	*/	22	*/
6		23
7	/*
8	CrossFire, A Multiplayer game for X-windows
9
10	Copyright (C) 2002 Mark Wedel & Crossfire Development Team
11	Copyright (C) 1992 Frank Tore Johansen
12
13	This program is free software; you can redistribute it and/or modify
14	it under the terms of the GNU General Public License as published by
15	the Free Software Foundation; either version 2 of the License, or
16	(at your option) any later version.
17
18	This program is distributed in the hope that it will be useful,
19	but WITHOUT ANY WARRANTY; without even the implied warranty of
20	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21	GNU General Public License for more details.
22
23	You should have received a copy of the GNU General Public License
24	along with this program; if not, write to the Free Software
25	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26
27	The authors can be reached via e-mail to crossfire-devel@real-time.com
28	*/
29	#include <assert.h>	24	#include <assert.h>
30	#include <global.h>	25	#include <global.h>
31	#include <living.h>	26	#include <living.h>
32	#include <material.h>	27	#include <material.h>
33	#include <skills.h>	28	#include <skills.h>
34
35	#ifndef __CEXTRACT__
36	# include <sproto.h>
37	#endif
38
39	#include <sounds.h>	29	#include <sounds.h>
		30	#include <sproto.h>
40		31
41	typedef struct att_msg_str	32	typedef struct att_msg_str
42	{	33	{
43	char *msg1;	34	char *msg1;
44	char *msg2;	35	char *msg2;
…		…
50	* its magical benefits.	41	* its magical benefits.
51	*/	42	*/
52	void	43	void
53	cancellation (object *op)	44	cancellation (object *op)
54	{	45	{
55	object *tmp;
56
57	if (op->invisible)	46	if (op->invisible)
58	return;	47	return;
59		48
60	if (QUERY_FLAG (op, FLAG_ALIVE) || op->type == CONTAINER || op->type == THROWN_OBJ)	49	if (QUERY_FLAG (op, FLAG_ALIVE) || op->type == CONTAINER || op->type == THROWN_OBJ)
61	{	50	{
62	/* Recur through the inventory */	51	/* Recurse through the inventory */
63	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	52	for (object *tmp = op->inv; tmp; tmp = tmp->below)
64	if (!did_make_save_item (tmp, AT_CANCELLATION, op))	53	if (!did_make_save_item (tmp, AT_CANCELLATION, op))
65	cancellation (tmp);	54	cancellation (tmp);
66	}	55	}
67	else if (FABS (op->magic) <= (rndm (0, 5)))	56	else if (FABS (op->magic) <= rndm (0, 5))
68	{	57	{
69	/* Nullify this object. This code could probably be more complete */	58	/* Nullify this object. This code could probably be more complete */
70	/* in what abilities it should cancel */	59	/* in what abilities it should cancel */
71	op->magic = 0;	60	op->magic = 0;
		61
72	CLEAR_FLAG (op, FLAG_DAMNED);	62	CLEAR_FLAG (op, FLAG_DAMNED);
73	CLEAR_FLAG (op, FLAG_CURSED);	63	CLEAR_FLAG (op, FLAG_CURSED);
74	CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);	64	CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);
75	CLEAR_FLAG (op, FLAG_KNOWN_CURSED);	65	CLEAR_FLAG (op, FLAG_KNOWN_CURSED);
76	if (op->env && op->env->type == PLAYER)
77	{
78	esrv_send_item (op->env, op);
79	}
80	}
81	}
82		66
83		67	if (object *pl = op->visible_to ())
		68	esrv_update_item (UPD_FLAGS, pl, op);
		69	}
		70	}
84		71
85	/* did_make_save_item just checks to make sure the item actually	72	/* did_make_save_item just checks to make sure the item actually
86	* made its saving throw based on the tables. It does not take	73	* made its saving throw based on the tables. It does not take
87	* any further action (like destroying the item).	74	* any further action (like destroying the item).
88	*/	75	*/
89
90	int	76	int
91	did_make_save_item (object *op, int type, object *originator)	77	did_make_save_item (object *op, int type, object *originator)
92	{	78	{
93	int i, roll, saves = 0, attacks = 0, number;	79	int i, roll, saves = 0, attacks = 0, number;
94	materialtype_t *mt;	80	materialtype_t *mt;
95		81
96	if (op->materialname == NULL)	82	if (op->materialname == NULL)
97	{	83	{
98	for (mt = materialt; mt != NULL && mt->next != NULL; mt = mt->next)	84	for (mt = materialt; mt != NULL && mt->next != NULL; mt = mt->next)
99	{
100	if (op->material & mt->material)	85	if (op->materials & mt->material)
101	break;	86	break;
102	}
103	}	87	}
104	else	88	else
105	mt = name_to_material (op->materialname);	89	mt = name_to_material (op->materialname);
106	if (mt == NULL)	90
		91	if (!mt)
107	return TRUE;	92	return TRUE;
		93
108	roll = rndm (1, 20);	94	roll = rndm (1, 20);
109		95
110	/* the attacktypes have no meaning for object saves	96	/* the attacktypes have no meaning for object saves
111	* If the type is only magic, don't adjust type - basically, if	97	* If the type is only magic, don't adjust type - basically, if
112	* pure magic is hitting an object, it should save. However, if it	98	* pure magic is hitting an object, it should save. However, if it
…		…
141	saves++;	127	saves++;
142	}	128	}
143		129
144	if (saves == attacks || attacks == 0)	130	if (saves == attacks || attacks == 0)
145	return TRUE;	131	return TRUE;
		132
146	if ((saves == 0) || (rndm (1, attacks) > saves))	133	if (saves == 0 || (rndm (1, attacks) > saves))
147	return FALSE;	134	return FALSE;
		135
148	return TRUE;	136	return TRUE;
149	}	137	}
150		138
151	/* This function calls did_make_save_item. It then performs the	139	/* This function calls did_make_save_item. It then performs the
152	* appropriate actions to the item (such as burning the item up,	140	* appropriate actions to the item (such as burning the item up,
153	* calling cancellation, etc.)	141	* calling cancellation, etc.)
154	*/	142	*/
155
156	void	143	void
157	save_throw_object (object *op, int type, object *originator)	144	save_throw_object (object *op, int type, object *originator)
158	{	145	{
159	if (!did_make_save_item (op, type, originator))	146	if (!did_make_save_item (op, type, originator))
160	{	147	{
161	object *env = op->env;	148	object *env = op->env;
162	int x = op->x, y = op->y;	149	int x = op->x, y = op->y;
163	mapstruct *m = op->map;	150	maptile *m = op->map;
164		151
165	op = stop_item (op);	152	op = stop_item (op);
166	if (op == NULL)	153	if (op == NULL)
167	return;	154	return;
168		155
…		…
174	* function if the object doesnt contain a material that can burn.	161	* function if the object doesnt contain a material that can burn.
175	* So forget lighting magical swords on fire with this!) -b.t.	162	* So forget lighting magical swords on fire with this!) -b.t.
176	*/	163	*/
177	if (type & (AT_FIRE | AT_ELECTRICITY) && op->other_arch && QUERY_FLAG (op, FLAG_IS_LIGHTABLE))	164	if (type & (AT_FIRE | AT_ELECTRICITY) && op->other_arch && QUERY_FLAG (op, FLAG_IS_LIGHTABLE))
178	{	165	{
179	const char *arch = op->other_arch->name;	166	const char *arch = op->other_arch->archname;
180		167
181	op = decrease_ob_nr (op, 1);	168	if (op->decrease ())
182
183	if (op)
184	fix_stopped_item (op, m, originator);	169	fix_stopped_item (op, m, originator);
185		170
186	if ((op = get_archetype (arch)) != NULL)	171	if ((op = get_archetype (arch)))
187	{	172	{
188	if (env)	173	if (env)
189	{	174	{
190	op->x = env->x, op->y = env->y;	175	op->x = env->x, op->y = env->y; //???? wtf
191	insert_ob_in_ob (op, env);	176	env->insert (op);
192	if (env->contr)
193	esrv_send_item (env, op);
194	}	177	}
195	else	178	else
196	{	179	{
197	op->x = x, op->y = y;	180	op->x = x, op->y = y;
198	insert_ob_in_map (op, m, originator, 0);	181	insert_ob_in_map (op, m, originator, 0);
…		…
209	return;	192	return;
210	}	193	}
211		194
212	if (op->nrof > 1)	195	if (op->nrof > 1)
213	{	196	{
214	op = decrease_ob_nr (op, rndm (0, op->nrof - 1));	197	if (op->decrease (rndm (0, op->nrof - 1)))
215
216	if (op)
217	fix_stopped_item (op, m, originator);	198	fix_stopped_item (op, m, originator);
218	}	199	}
219	else	200	else
220	{	201	op->destroy ();
221	if (op->env)
222	{
223	object *tmp = is_player_inv (op->env);
224
225	if (tmp)
226	esrv_del_item (tmp->contr, op->count);
227	}
228
229	if (!QUERY_FLAG (op, FLAG_REMOVED))
230	remove_ob (op);
231
232	free_object (op);
233	}
234		202
235	if (type & (AT_FIRE | AT_ELECTRICITY))	203	if (type & (AT_FIRE | AT_ELECTRICITY))
236	if (env)	204	if (env)
237	{	205	{
238	op = get_archetype ("burnout");	206	op = get_archetype ("burnout");
…		…
247		215
248	/* The value of 50 is arbitrary. */	216	/* The value of 50 is arbitrary. */
249	if (type & AT_COLD && (op->resist[ATNR_COLD] < 50) && !QUERY_FLAG (op, FLAG_NO_PICK) && (RANDOM () & 2))	217	if (type & AT_COLD && (op->resist[ATNR_COLD] < 50) && !QUERY_FLAG (op, FLAG_NO_PICK) && (RANDOM () & 2))
250	{	218	{
251	object *tmp;	219	object *tmp;
252	archetype *at = find_archetype ("icecube");	220	archetype *at = archetype::find ("icecube");
253		221
254	if (at == NULL)	222	if (at == NULL)
255	return;	223	return;
256		224
257	op = stop_item (op);	225	op = stop_item (op);
…		…
270	tmp->move_slow = 0;	238	tmp->move_slow = 0;
271	insert_ob_in_map (tmp, op->map, originator, 0);	239	insert_ob_in_map (tmp, op->map, originator, 0);
272	}	240	}
273		241
274	if (!QUERY_FLAG (op, FLAG_REMOVED))	242	if (!QUERY_FLAG (op, FLAG_REMOVED))
275	remove_ob (op);	243	op->remove ();
276		244
277	insert_ob_in_ob (op, tmp);	245	insert_ob_in_ob (op, tmp);
278	return;	246	return;
279	}	247	}
280	}	248	}
…		…
283	* op is going in direction 'dir'	251	* op is going in direction 'dir'
284	* type is the attacktype of the object.	252	* type is the attacktype of the object.
285	* full_hit is set if monster area does not matter.	253	* full_hit is set if monster area does not matter.
286	* returns 1 if it hits something, 0 otherwise.	254	* returns 1 if it hits something, 0 otherwise.
287	*/	255	*/
288
289	int	256	int
290	hit_map (object *op, int dir, int type, int full_hit)	257	hit_map (object *op, int dir, int type, int full_hit)
291	{	258	{
292	object *tmp, *next;
293	mapstruct *map;	259	maptile *map;
294	sint16 x, y;	260	sint16 x, y;
295	int retflag = 0; /* added this flag.. will return 1 if it hits a monster */	261	int retflag = 0; /* added this flag.. will return 1 if it hits a monster */
296		262
297	tag_t op_tag, next_tag = 0;
298
299	if (QUERY_FLAG (op, FLAG_FREED))	263	if (QUERY_FLAG (op, FLAG_FREED))
300	{	264	{
301	LOG (llevError, "BUG: hit_map(): free object\n");	265	LOG (llevError, "BUG: hit_map(): free object\n");
302	return 0;	266	return 0;
303	}	267	}
304		268
305	if (QUERY_FLAG (op, FLAG_REMOVED) || op->env != NULL)	269	if (QUERY_FLAG (op, FLAG_REMOVED) || op->env != NULL)
306	{	270	{
307	LOG (llevError, "BUG: hit_map(): hitter (arch %s, name %s) not on a map\n", &op->arch->name, &op->name);	271	LOG (llevError, "BUG: hit_map(): hitter (arch %s, name %s) not on a map\n", &op->arch->archname, &op->name);
308	return 0;	272	return 0;
309	}	273	}
310		274
311	if (!op->map)	275	if (!op->map)
312	{	276	{
…		…
314	return 0;	278	return 0;
315	}	279	}
316		280
317	if (op->head)	281	if (op->head)
318	op = op->head;	282	op = op->head;
319
320	op_tag = op->count;
321		283
322	map = op->map;	284	map = op->map;
323	x = op->x + freearr_x[dir];	285	x = op->x + freearr_x[dir];
324	y = op->y + freearr_y[dir];	286	y = op->y + freearr_y[dir];
325		287
326	int mflags = get_map_flags (map, &map, x, y, &x, &y);	288	if (!xy_normalise (map, x, y))
		289	return 0;
327		290
328	// elmex: a safe map tile can't be hit!	291	// elmex: a safe map tile can't be hit!
329	// this should prevent most harmful effects on items and players there.	292	// this should prevent most harmful effects on items and players there.
330	if (mflags & (P_OUT_OF_MAP | P_SAFE))	293	mapspace &ms = map->at (x, y);
		294
		295	if (ms.flags () & P_SAFE)
331	return 0;	296	return 0;
332		297
333	/* peterm: a few special cases for special attacktypes --counterspell	298	/* peterm: a few special cases for special attacktypes --counterspell
334	* must be out here because it strikes things which are not alive	299	* must be out here because it strikes things which are not alive
335	*/	300	*/
336		301	if (type & (AT_COUNTERSPELL | AT_CHAOS))
		302	{
337	if (type & AT_COUNTERSPELL)	303	if (type & AT_COUNTERSPELL)
338	{	304	{
339	counterspell (op, dir); /* see spell_effect.c */	305	counterspell (op, dir); /* see spell_effect.c */
340		306
341	/* If the only attacktype is counterspell or magic, don't need	307	/* If the only attacktype is counterspell or magic, don't need
342	* to do any further processing.	308	* to do any further processing.
343	*/
344	if (!(type & ~(AT_COUNTERSPELL | AT_MAGIC)))
345	return 0;
346
347	type &= ~AT_COUNTERSPELL;
348	}
349
350	if (type & AT_CHAOS)
351	{
352	shuffle_attack (op, 1); /*1 flag tells it to change the face */
353	update_object (op, UP_OBJ_FACE);
354	type &= ~AT_CHAOS;
355	}
356
357	next = get_map_ob (map, x, y);
358	if (next)
359	next_tag = next->count;
360
361	while (next)
362	{
363	if (was_destroyed (next, next_tag))
364	{
365	/* There may still be objects that were above 'next', but there is no
366	* simple way to find out short of copying all object references and
367	* tags into a temporary array before we start processing the first
368	* object. That's why we just abort.
369	*
370	* This happens whenever attack spells (like fire) hit a pile
371	* of objects. This is not a bug - nor an error. The errormessage
372	* below was spamming the logs for absolutely no reason.
373	*/	309	*/
374	/* LOG (llevDebug, "hit_map(): next object destroyed\n"); */	310	if (!(type & ~(AT_COUNTERSPELL | AT_MAGIC)))
375	break;	311	return 0;
		312
		313	type &= ~AT_COUNTERSPELL;
		314	}
		315
		316	if (type & AT_CHAOS)
376	}	317	{
		318	shuffle_attack (op, 1); /* flag tells it to change the face */
		319	update_object (op, UP_OBJ_FACE);
		320	type &= ~AT_CHAOS;
		321	}
		322	}
377		323
		324	/* There may still be objects that were above 'next', but there is no
		325	* simple way to find out short of copying all object references and
		326	* tags into a temporary array before we start processing the first
		327	* object. That's why we just abort on destroy.
		328	*
		329	* This happens whenever attack spells (like fire) hit a pile
		330	* of objects. This is not a bug - nor an error.
		331	*/
		332	for (object *next = ms.bot; next && !next->destroyed (); )
		333	{
378	tmp = next;	334	object *tmp = next;
379	next = tmp->above;	335	next = tmp->above;
380
381	if (next)
382	next_tag = next->count;
383
384	if (QUERY_FLAG (tmp, FLAG_FREED))
385	{
386	LOG (llevError, "BUG: hit_map(): found freed object\n");
387	break;
388	}
389		336
390	/* Something could have happened to 'tmp' while 'tmp->below' was processed.	337	/* Something could have happened to 'tmp' while 'tmp->below' was processed.
391	* For example, 'tmp' was put in an icecube.	338	* For example, 'tmp' was put in an icecube.
392	* This is one of the few cases where on_same_map should not be used.	339	* This is one of the few cases where on_same_map should not be used.
393	*/	340	*/
…		…
396		343
397	if (QUERY_FLAG (tmp, FLAG_ALIVE))	344	if (QUERY_FLAG (tmp, FLAG_ALIVE))
398	{	345	{
399	hit_player (tmp, op->stats.dam, op, type, full_hit);	346	hit_player (tmp, op->stats.dam, op, type, full_hit);
400	retflag |= 1;	347	retflag |= 1;
		348
401	if (was_destroyed (op, op_tag))	349	if (op->destroyed ())
402	break;	350	break;
403	}	351	}
404
405	/* Here we are potentially destroying an object. If the object has	352	/* Here we are potentially destroying an object. If the object has
406	* NO_PASS set, it is also immune - you can't destroy walls. Note	353	* NO_PASS set, it is also immune - you can't destroy walls. Note
407	* that weak walls have is_alive set, which prevent objects from	354	* that weak walls have is_alive set, which prevent objects from
408	* passing over/through them. We don't care what type of movement	355	* passing over/through them. We don't care what type of movement
409	* the wall blocks - if it blocks any type of movement, can't be	356	* the wall blocks - if it blocks any type of movement, can't be
410	* destroyed right now.	357	* destroyed right now.
411	*/	358	*/
412	else if ((tmp->material || tmp->materialname) && op->stats.dam > 0 && !tmp->move_block)	359	else if (tmp->materialname && op->stats.dam > 0 && !tmp->move_block)
413	{	360	{
414	save_throw_object (tmp, type, op);	361	save_throw_object (tmp, type, op);
		362
415	if (was_destroyed (op, op_tag))	363	if (op->destroyed ())
416	break;	364	break;
417	}	365	}
418	}	366	}
419		367
420	return 0;	368	return 0;
…		…
423	void	371	void
424	attack_message (int dam, int type, object *op, object *hitter)	372	attack_message (int dam, int type, object *op, object *hitter)
425	{	373	{
426	char buf[MAX_BUF], buf1[MAX_BUF], buf2[MAX_BUF];	374	char buf[MAX_BUF], buf1[MAX_BUF], buf2[MAX_BUF];
427	int i, found = 0;	375	int i, found = 0;
428	mapstruct *map;	376	maptile *map;
429	object *next, *tmp;	377	object *next, *tmp;
430		378
431	/* put in a few special messages for some of the common attacktypes	379	/* put in a few special messages for some of the common attacktypes
432	* a player might have. For example, fire, electric, cold, etc	380	* a player might have. For example, fire, electric, cold, etc
433	* [garbled 20010919]	381	* [garbled 20010919]
…		…
450	sprintf (buf1, "missed %s", &op->name);	398	sprintf (buf1, "missed %s", &op->name);
451	sprintf (buf2, " misses");	399	sprintf (buf2, " misses");
452	found++;	400	found++;
453	}	401	}
454	else if ((hitter->type == DISEASE || hitter->type == SYMPTOM ||	402	else if ((hitter->type == DISEASE || hitter->type == SYMPTOM ||
455	hitter->type == POISONING || (type & AT_POISON && IS_LIVE (op))) && !found)	403	hitter->type == POISONING || (type & AT_POISON && op->is_alive ())) && !found)
456	{	404	{
457	for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_SUFFER][i].level != -1; i++)	405	for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_SUFFER][i].level != -1; i++)
458	if (dam < attack_mess[ATM_SUFFER][i].level || attack_mess[ATM_SUFFER][i + 1].level == -1)	406	if (dam < attack_mess[ATM_SUFFER][i].level || attack_mess[ATM_SUFFER][i + 1].level == -1)
459	{	407	{
460	sprintf (buf1, "%s %s%s", attack_mess[ATM_SUFFER][i].buf1, &op->name, attack_mess[ATM_SUFFER][i].buf2);	408	sprintf (buf1, "%s %s%s", attack_mess[ATM_SUFFER][i].buf1, &op->name, attack_mess[ATM_SUFFER][i].buf2);
…		…
472	strcpy (buf2, attack_mess[ATM_DOOR][i].buf3);	420	strcpy (buf2, attack_mess[ATM_DOOR][i].buf3);
473	found++;	421	found++;
474	break;	422	break;
475	}	423	}
476	}	424	}
477	else if (hitter->type == PLAYER && IS_LIVE (op))	425	else if (hitter->type == PLAYER && op->is_alive ())
478	{	426	{
479	if (USING_SKILL (hitter, SK_KARATE))	427	if (USING_SKILL (hitter, SK_KARATE))
480	{	428	{
481	for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_KARATE][i].level != -1; i++)	429	for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_KARATE][i].level != -1; i++)
482	if (dam < attack_mess[ATM_KARATE][i].level || attack_mess[ATM_KARATE][i + 1].level == -1)	430	if (dam < attack_mess[ATM_KARATE][i].level || attack_mess[ATM_KARATE][i + 1].level == -1)
…		…
508	found++;	456	found++;
509	break;	457	break;
510	}	458	}
511	}	459	}
512	}	460	}
		461
513	if (found)	462	if (found)
514	{	463	{
515	/* done */	464	/* done */
516	}	465	}
517	else if (IS_ARROW (hitter) && (type == AT_PHYSICAL || type == AT_MAGIC))	466	else if (hitter->is_arrow () && (type == AT_PHYSICAL || type == AT_MAGIC))
518	{	467	{
519	sprintf (buf1, "hit"); /* just in case */	468	sprintf (buf1, "hit"); /* just in case */
520	for (i = 0; i < MAXATTACKMESS; i++)	469	for (i = 0; i < MAXATTACKMESS; i++)
521	if (dam < attack_mess[ATM_ARROW][i].level || attack_mess[ATM_ARROW][i + 1].level == -1)	470	if (dam < attack_mess[ATM_ARROW][i].level || attack_mess[ATM_ARROW][i + 1].level == -1)
522	{	471	{
523	strcpy (buf2, attack_mess[ATM_ARROW][i].buf3);	472	strcpy (buf2, attack_mess[ATM_ARROW][i].buf3);
524	found++;	473	found++;
525	break;	474	break;
526	}	475	}
527	}	476	}
528	else if (type & AT_DRAIN && IS_LIVE (op))	477	else if (type & AT_DRAIN && op->is_alive ())
529	{	478	{
530	/* drain is first, because some items have multiple attypes */	479	/* drain is first, because some items have multiple attypes */
531	for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_DRAIN][i].level != -1; i++)	480	for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_DRAIN][i].level != -1; i++)
532	if (dam < attack_mess[ATM_DRAIN][i].level || attack_mess[ATM_DRAIN][i + 1].level == -1)	481	if (dam < attack_mess[ATM_DRAIN][i].level || attack_mess[ATM_DRAIN][i + 1].level == -1)
533	{	482	{
…		…
535	strcpy (buf2, attack_mess[ATM_DRAIN][i].buf3);	484	strcpy (buf2, attack_mess[ATM_DRAIN][i].buf3);
536	found++;	485	found++;
537	break;	486	break;
538	}	487	}
539	}	488	}
540	else if (type & AT_ELECTRICITY && IS_LIVE (op))	489	else if (type & AT_ELECTRICITY && op->is_alive ())
541	{	490	{
542	for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_ELEC][i].level != -1; i++)	491	for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_ELEC][i].level != -1; i++)
543	if (dam < attack_mess[ATM_ELEC][i].level || attack_mess[ATM_ELEC][i + 1].level == -1)	492	if (dam < attack_mess[ATM_ELEC][i].level || attack_mess[ATM_ELEC][i + 1].level == -1)
544	{	493	{
545	sprintf (buf1, "%s %s%s", attack_mess[ATM_ELEC][i].buf1, &op->name, attack_mess[ATM_ELEC][i].buf2);	494	sprintf (buf1, "%s %s%s", attack_mess[ATM_ELEC][i].buf1, &op->name, attack_mess[ATM_ELEC][i].buf2);
546	strcpy (buf2, attack_mess[ATM_ELEC][i].buf3);	495	strcpy (buf2, attack_mess[ATM_ELEC][i].buf3);
547	found++;	496	found++;
548	break;	497	break;
549	}	498	}
550	}	499	}
551	else if (type & AT_COLD && IS_LIVE (op))	500	else if (type & AT_COLD && op->is_alive ())
552	{	501	{
553	for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_COLD][i].level != -1; i++)	502	for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_COLD][i].level != -1; i++)
554	if (dam < attack_mess[ATM_COLD][i].level || attack_mess[ATM_COLD][i + 1].level == -1)	503	if (dam < attack_mess[ATM_COLD][i].level || attack_mess[ATM_COLD][i + 1].level == -1)
555	{	504	{
556	sprintf (buf1, "%s %s%s", attack_mess[ATM_COLD][i].buf1, &op->name, attack_mess[ATM_COLD][i].buf2);	505	sprintf (buf1, "%s %s%s", attack_mess[ATM_COLD][i].buf1, &op->name, attack_mess[ATM_COLD][i].buf2);
…		…
633	strcpy (buf1, "hit");	582	strcpy (buf1, "hit");
634	strcpy (buf2, " hits");	583	strcpy (buf2, " hits");
635	}	584	}
636		585
637	/* bail out if a monster is casting spells */	586	/* bail out if a monster is casting spells */
638	if (!(hitter->type == PLAYER || (get_owner (hitter) != NULL && hitter->owner->type == PLAYER)))	587	if (!(hitter->type == PLAYER || (hitter->owner != NULL && hitter->owner->type == PLAYER)))
639	return;	588	return;
640		589
641	/* scale down magic considerably. */	590	/* scale down magic considerably. */
642	if (type & AT_MAGIC && rndm (0, 5))	591	if (type & AT_MAGIC && rndm (0, 5))
643	return;	592	return;
644		593
645	/* Did a player hurt another player? Inform both! */	594	/* Did a player hurt another player? Inform both! */
646	if (op->type == PLAYER && (get_owner (hitter) == NULL ? hitter->type : hitter->owner->type) == PLAYER)	595	if (op->type == PLAYER && (hitter->owner == NULL ? hitter->type : hitter->owner->type) == PLAYER)
647	{	596	{
648	if (get_owner (hitter) != NULL)	597	if (hitter->owner != NULL)
649	sprintf (buf, "%s's %s%s you.", &hitter->owner->name, &hitter->name, buf2);	598	sprintf (buf, "%s's %s%s you.", &hitter->owner->name, &hitter->name, buf2);
650	else	599	else
651	{	600	{
652	sprintf (buf, "%s%s you.", &hitter->name, buf2);	601	sprintf (buf, "%s%s you.", &hitter->name, buf2);
		602
653	if (dam != 0)	603	if (dam != 0)
654	{	604	{
655	if (dam < 10)	605	if (dam < 10)
656	play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT1, 0, 0);	606	op->contr->play_sound (sound_find ("player_is_hit1"));
657	else if (dam < 20)	607	else if (dam < 20)
658	play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT2, 0, 0);	608	op->contr->play_sound (sound_find ("player_is_hit2"));
659	else	609	else
660	play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT3, 0, 0);	610	op->contr->play_sound (sound_find ("player_is_hit3"));
661	}	611	}
662	}	612	}
		613
663	new_draw_info (NDI_BLACK, 0, op, buf);	614	new_draw_info (NDI_BLACK, 0, op, buf);
664	} /* end of player hitting player */	615	} /* end of player hitting player */
665		616
666	if (hitter->type == PLAYER)	617	if (hitter->type == PLAYER)
667	{	618	{
668	sprintf (buf, "You %s.", buf1);	619	sprintf (buf, "You %s.", buf1);
		620
669	if (dam != 0)	621	if (dam != 0)
670	{	622	{
671	if (dam < 10)	623	if (dam < 10)
672	play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS1, 0, 0);	624	op->play_sound (sound_find ("player_hits1"));
673	else if (dam < 20)	625	else if (dam < 20)
674	play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS2, 0, 0);	626	op->play_sound (sound_find ("player_hits2"));
675	else	627	else
676	play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS3, 0, 0);	628	op->play_sound (sound_find ("player_hits3"));
677	}	629	}
		630
678	new_draw_info (NDI_BLACK, 0, hitter, buf);	631	new_draw_info (NDI_BLACK, 0, hitter, buf);
679	}	632	}
680	else if (get_owner (hitter) != NULL && hitter->owner->type == PLAYER)	633	else if (hitter->owner != NULL && hitter->owner->type == PLAYER)
681	{	634	{
682	/* look for stacked spells and start reducing the message chances */	635	/* look for stacked spells and start reducing the message chances */
683	if (hitter->type == SPELL_EFFECT && (hitter->subtype == SP_EXPLOSION || hitter->subtype == SP_BULLET || hitter->subtype == SP_CONE))	636	if (hitter->type == SPELL_EFFECT && (hitter->subtype == SP_EXPLOSION || hitter->subtype == SP_BULLET || hitter->subtype == SP_CONE))
684	{	637	{
685	i = 4;	638	i = 4;
686	map = hitter->map;	639	map = hitter->map;
687	if (out_of_map (map, hitter->x, hitter->y))	640	if (out_of_map (map, hitter->x, hitter->y))
688	return;	641	return;
		642
689	next = get_map_ob (map, hitter->x, hitter->y);	643	next = GET_MAP_OB (map, hitter->x, hitter->y);
690	if (next)	644	if (next)
691	while (next)	645	while (next)
692	{	646	{
693	if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE))	647	if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE))
694	i *= 3;	648	i *= 3;
		649
695	tmp = next;	650	tmp = next;
696	next = tmp->above;	651	next = tmp->above;
697	}	652	}
		653
698	if (i < 0)	654	if (i < 0)
699	return;	655	return;
		656
700	if (rndm (0, i) != 0)	657	if (rndm (0, i) != 0)
701	return;	658	return;
702	}	659	}
703	else if (rndm (0, 5) != 0)	660	else if (rndm (0, 5) != 0)
704	return;	661	return;
		662
705	sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name);	663	sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name);
706	play_sound_map (op->map, op->x, op->y, SOUND_PLAYER_HITS4);	664	op->play_sound (sound_find ("player_hits4"));
707	new_draw_info (NDI_BLACK, 0, hitter->owner, buf);	665	new_draw_info (NDI_BLACK, 0, hitter->owner, buf);
708	}	666	}
709	}	667	}
710		668
711		669
…		…
715	if (QUERY_FLAG (*target, FLAG_FREED) || QUERY_FLAG (*hitter, FLAG_FREED))	673	if (QUERY_FLAG (*target, FLAG_FREED) || QUERY_FLAG (*hitter, FLAG_FREED))
716	{	674	{
717	LOG (llevError, "BUG: get_attack_mode(): freed object\n");	675	LOG (llevError, "BUG: get_attack_mode(): freed object\n");
718	return 1;	676	return 1;
719	}	677	}
		678
720	if ((*target)->head)	679	if ((*target)->head)
721	*target = (*target)->head;	680	*target = (*target)->head;
		681
722	if ((*hitter)->head)	682	if ((*hitter)->head)
723	*hitter = (*hitter)->head;	683	*hitter = (*hitter)->head;
		684
724	if ((*hitter)->env != NULL || (*target)->env != NULL)	685	if ((*hitter)->env != NULL || (*target)->env != NULL)
725	{	686	{
726	*simple_attack = 1;	687	*simple_attack = 1;
727	return 0;	688	return 0;
728	}	689	}
		690
729	if (QUERY_FLAG (*target, FLAG_REMOVED)	691	if (QUERY_FLAG (*target, FLAG_REMOVED)
730	|| QUERY_FLAG (*hitter, FLAG_REMOVED) || (*hitter)->map == NULL || !on_same_map ((*hitter), (*target)))	692	|| QUERY_FLAG (*hitter, FLAG_REMOVED)
		693	|| !(*hitter)->map
		694	|| !on_same_map (*hitter, *target))
731	{	695	{
732	LOG (llevError, "BUG: hitter (arch %s, name %s) with no relation to " "target\n", &(*hitter)->arch->name, &(*hitter)->name);	696	LOG (llevError | logBacktrace, "BUG: hitter (%s) with no relation to target (%s)\n",
		697	(*hitter)->debug_desc (), (*target)->debug_desc ());
733	return 1;	698	return 1;
734	}	699	}
		700
735	*simple_attack = 0;	701	*simple_attack = 0;
736	return 0;	702	return 0;
737	}	703	}
738		704
739	static int	705	static int
…		…
760	attack_ob_simple (object *op, object *hitter, int base_dam, int base_wc)	726	attack_ob_simple (object *op, object *hitter, int base_dam, int base_wc)
761	{	727	{
762	int simple_attack, roll, dam = 0;	728	int simple_attack, roll, dam = 0;
763	uint32 type;	729	uint32 type;
764	shstr op_name;	730	shstr op_name;
765	tag_t op_tag, hitter_tag;
766		731
767	if (get_attack_mode (&op, &hitter, &simple_attack))	732	if (get_attack_mode (&op, &hitter, &simple_attack))
768	goto error;	733	goto error;
769		734
770	if (hitter->current_weapon)	735	if (hitter->current_weapon)
771	if (INVOKE_OBJECT (WEAPON_ATTACK, hitter->current_weapon, ARG_OBJECT (hitter), ARG_OBJECT (op)))	736	if (INVOKE_OBJECT (WEAPON_ATTACK, hitter->current_weapon, ARG_OBJECT (hitter), ARG_OBJECT (op)))
772	return RESULT_INT (0);	737	return RESULT_INT (0);
773		738
774	if (INVOKE_OBJECT (ATTACK, op, ARG_OBJECT (hitter)))	739	if (INVOKE_OBJECT (ATTACK, op, ARG_OBJECT (hitter)))
775	return RESULT_INT (0);	740	return RESULT_INT (0);
776
777	op_tag = op->count;
778	hitter_tag = hitter->count;
779		741
780	/*	742	/*
781	* A little check to make it more difficult to dance forward and back	743	* A little check to make it more difficult to dance forward and back
782	* to avoid ever being hit by monsters.	744	* to avoid ever being hit by monsters.
783	*/	745	*/
784	if (!simple_attack && QUERY_FLAG (op, FLAG_MONSTER) && op->speed_left > -(FABS (op->speed)) * 0.3)	746	if (!simple_attack && QUERY_FLAG (op, FLAG_MONSTER) && op->speed_left > abs (op->speed) * -0.3f)
785	{	747	{
786	/* Decrease speed BEFORE calling process_object. Otherwise, an	748	/* Decrease speed BEFORE calling process_object. Otherwise, an
787	* infinite loop occurs, with process_object calling move_monster,	749	* infinite loop occurs, with process_object calling move_monster,
788	* which then gets here again. By decreasing the speed before	750	* which then gets here again. By decreasing the speed before
789	* we call process_object, the 'if' statement above will fail.	751	* we call process_object, the 'if' statement above will fail.
790	*/	752	*/
791	op->speed_left--;	753	--op->speed_left;
792	process_object (op);	754	process_object (op);
		755
793	if (was_destroyed (op, op_tag) || was_destroyed (hitter, hitter_tag) || abort_attack (op, hitter, simple_attack))	756	if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack))
794	goto error;	757	goto error;
795	}	758	}
796		759
797	op_name = op->name;	760	op_name = op->name;
798		761
…		…
805	/* See if we hit the creature */	768	/* See if we hit the creature */
806	if (roll == 20 || op->stats.ac >= base_wc - roll)	769	if (roll == 20 || op->stats.ac >= base_wc - roll)
807	{	770	{
808	int hitdam = base_dam;	771	int hitdam = base_dam;
809		772
810	if (settings.casting_time == TRUE)
811	{
812	if ((hitter->type == PLAYER) && (hitter->casting_time > -1))
813	{
814	hitter->casting_time = -1;
815	new_draw_info (NDI_UNIQUE, 0, hitter, "You attacked and lost " "your spell!");
816	}
817	if ((op->casting_time > -1) && (hitdam > 0))
818	{
819	op->casting_time = -1;
820	if (op->type == PLAYER)
821	{
822	new_draw_info (NDI_UNIQUE, 0, op, "You were hit and lost " "your spell!");
823	new_draw_info_format (NDI_ALL | NDI_UNIQUE, 5, NULL, "%s was hit by %s and lost a spell.", &op_name, &hitter->name);
824	}
825	}
826	}
827	if (!simple_attack)	773	if (!simple_attack)
828	{	774	{
829	/* If you hit something, the victim should *always* wake up.	775	/* If you hit something, the victim should *always* wake up.
830	* Before, invisible hitters could avoid doing this.	776	* Before, invisible hitters could avoid doing this.
831	* -b.t. */	777	* -b.t. */
832	if (QUERY_FLAG (op, FLAG_SLEEP))	778	if (QUERY_FLAG (op, FLAG_SLEEP))
833	CLEAR_FLAG (op, FLAG_SLEEP);	779	CLEAR_FLAG (op, FLAG_SLEEP);
834		780
835	/* If the victim can't see the attacker, it may alert others	781	/* If the victim can't see the attacker, it may alert others
836	* for help. */	782	* for help. */
837	if (op->type != PLAYER && !can_see_enemy (op, hitter) && !get_owner (op) && rndm (0, op->stats.Int))	783	if (op->type != PLAYER && !can_see_enemy (op, hitter) && !op->owner && rndm (0, op->stats.Int))
838	npc_call_help (op);	784	npc_call_help (op);
839		785
840	/* if you were hidden and hit by a creature, you are discovered */	786	/* if you were hidden and hit by a creature, you are discovered */
841	if (op->hide && QUERY_FLAG (hitter, FLAG_ALIVE))	787	if (op->hide && QUERY_FLAG (hitter, FLAG_ALIVE))
842	{	788	{
843	make_visible (op);	789	make_visible (op);
		790
844	if (op->type == PLAYER)	791	if (op->type == PLAYER)
845	new_draw_info (NDI_UNIQUE, 0, op, "You were hit by a wild attack. " "You are no longer hidden!");	792	new_draw_info (NDI_UNIQUE, 0, op, "You were hit by a wild attack. " "You are no longer hidden!");
846	}	793	}
847		794
848	/* thrown items (hitter) will have various effects	795	/* thrown items (hitter) will have various effects
849	* when they hit the victim. For things like thrown daggers,	796	* when they hit the victim. For things like thrown daggers,
850	* this sets 'hitter' to the actual dagger, and not the	797	* this sets 'hitter' to the actual dagger, and not the
851	* wrapper object.	798	* wrapper object.
852	*/	799	*/
853	thrown_item_effect (hitter, op);	800	thrown_item_effect (hitter, op);
		801
854	if (was_destroyed (hitter, hitter_tag) || was_destroyed (op, op_tag) || abort_attack (op, hitter, simple_attack))	802	if (hitter->destroyed () || op->destroyed () || abort_attack (op, hitter, simple_attack))
855	goto leave;	803	goto leave;
856	}	804	}
857		805
858	/* Need to do at least 1 damage, otherwise there is no point	806	/* Need to do at least 1 damage, otherwise there is no point
859	* to go further and it will cause FPE's below.	807	* to go further and it will cause FPE's below.
860	*/	808	*/
861	if (hitdam <= 0)	809	if (hitdam <= 0)
862	hitdam = 1;	810	hitdam = 1;
863		811
864	type = hitter->attacktype;	812	type = hitter->attacktype;
		813
865	if (!type)	814	if (!type)
866	type = AT_PHYSICAL;	815	type = AT_PHYSICAL;
		816
867	/* Handle monsters that hit back */	817	/* Handle monsters that hit back */
868	if (!simple_attack && QUERY_FLAG (op, FLAG_HITBACK) && QUERY_FLAG (hitter, FLAG_ALIVE))	818	if (!simple_attack && QUERY_FLAG (op, FLAG_HITBACK) && QUERY_FLAG (hitter, FLAG_ALIVE))
869	{	819	{
870	if (op->attacktype & AT_ACID && hitter->type == PLAYER)	820	if (op->attacktype & AT_ACID && hitter->type == PLAYER)
871	new_draw_info (NDI_UNIQUE, 0, hitter, "You are splashed by acid!\n");	821	new_draw_info (NDI_UNIQUE, 0, hitter, "You are splashed by acid!\n");
		822
872	hit_player (hitter, random_roll (0, (op->stats.dam), hitter, PREFER_LOW), op, op->attacktype, 1);	823	hit_player (hitter, random_roll (0, (op->stats.dam), hitter, PREFER_LOW), op, op->attacktype, 1);
		824
873	if (was_destroyed (op, op_tag) || was_destroyed (hitter, hitter_tag) || abort_attack (op, hitter, simple_attack))	825	if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack))
874	goto leave;	826	goto leave;
875	}	827	}
876		828
877	/* In the new attack code, it should handle multiple attack	829	/* In the new attack code, it should handle multiple attack
878	* types in its area, so remove it from here.	830	* types in its area, so remove it from here.
879	*/	831	*/
880	dam = hit_player (op, random_roll (1, hitdam, hitter, PREFER_HIGH), hitter, type, 1);	832	dam = hit_player (op, random_roll (1, hitdam, hitter, PREFER_HIGH), hitter, type, 1);
		833
881	if (was_destroyed (op, op_tag) || was_destroyed (hitter, hitter_tag) || abort_attack (op, hitter, simple_attack))	834	if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack))
882	goto leave;	835	goto leave;
883	} /* end of if hitter hit op */	836	} /* end of if hitter hit op */
884	/* if we missed, dam=0 */	837	/* if we missed, dam=0 */
885		838
886	/*attack_message(dam, type, op, hitter); */	839	/*attack_message(dam, type, op, hitter); */
…		…
896	}	849	}
897		850
898	int	851	int
899	attack_ob (object *op, object *hitter)	852	attack_ob (object *op, object *hitter)
900	{	853	{
901
902	if (hitter->head)
903	hitter = hitter->head;	854	hitter = hitter->head_ ();
		855
904	return attack_ob_simple (op, hitter, hitter->stats.dam, hitter->stats.wc);	856	return attack_ob_simple (op, hitter, hitter->stats.dam, hitter->stats.wc);
905	}	857	}
906		858
907	/* op is the arrow, tmp is what is stopping the arrow.	859	/* op is the arrow, tmp is what is stopping the arrow.
908	*	860	*
…		…
917	* debate - 5000 is 5 kg, so arrows, knives, and other light weapons	869	* debate - 5000 is 5 kg, so arrows, knives, and other light weapons
918	* stick around.	870	* stick around.
919	*/	871	*/
920	if (op->weight <= 5000 && tmp->stats.hp >= 0)	872	if (op->weight <= 5000 && tmp->stats.hp >= 0)
921	{	873	{
922	if (tmp->head != NULL)	874	tmp->head_ ()->insert (op);
923	tmp = tmp->head;
924
925	remove_ob (op);
926	op = insert_ob_in_ob (op, tmp);
927
928	if (tmp->type == PLAYER)
929	esrv_send_item (tmp, op);
930
931	return 1;	875	return 1;
932	}	876	}
933	else	877	else
934	return 0;	878	return 0;
935	}	879	}
…		…
943	object *	887	object *
944	hit_with_arrow (object *op, object *victim)	888	hit_with_arrow (object *op, object *victim)
945	{	889	{
946	object *container, *hitter;	890	object *container, *hitter;
947	int hit_something = 0;	891	int hit_something = 0;
948	tag_t victim_tag, hitter_tag;
949	sint16 victim_x, victim_y;
950		892
951	/* Disassemble missile */	893	/* Disassemble missile */
952	if (op->inv)	894	if (op->inv)
953	{	895	{
954	container = op;	896	container = op;
955	hitter = op->inv;	897	hitter = op->inv;
956	remove_ob (hitter);	898	hitter->remove ();
957	insert_ob_in_map (hitter, container->map, hitter, INS_NO_MERGE | INS_NO_WALK_ON);	899	insert_ob_in_map (hitter, container->map, hitter, INS_NO_MERGE | INS_NO_WALK_ON);
958	/* Note that we now have an empty THROWN_OBJ on the map. Code that	900	/* Note that we now have an empty THROWN_OBJ on the map. Code that
959	* might be called until this THROWN_OBJ is either reassembled or	901	* might be called until this THROWN_OBJ is either reassembled or
960	* removed at the end of this function must be able to deal with empty	902	* removed at the end of this function must be able to deal with empty
961	* THROWN_OBJs. */	903	* THROWN_OBJs. */
962	}	904	}
963	else	905	else
964	{	906	{
965	container = NULL;	907	container = 0;
966	hitter = op;	908	hitter = op;
967	}	909	}
968		910
969	/* Try to hit victim */	911	/* Try to hit victim */
970	victim_x = victim->x;
971	victim_y = victim->y;
972	victim_tag = victim->count;
973	hitter_tag = hitter->count;
974
975	hit_something = attack_ob_simple (victim, hitter, op->stats.dam, op->stats.wc);	912	hit_something = attack_ob_simple (victim, hitter, op->stats.dam, op->stats.wc);
976		913
977	/* Arrow attacks door, rune of summoning is triggered, demon is put on	914	/* Arrow attacks door, rune of summoning is triggered, demon is put on
978	* arrow, move_apply() calls this function, arrow sticks in demon,	915	* arrow, move_apply() calls this function, arrow sticks in demon,
979	* attack_ob_simple() returns, and we've got an arrow that still exists	916	* attack_ob_simple() returns, and we've got an arrow that still exists
980	* but is no longer on the map. Ugh. (Beware: Such things can happen at	917	* but is no longer on the map. Ugh. (Beware: Such things can happen at
981	* other places as well!)	918	* other places as well!)
982	*/	919	*/
983	if (was_destroyed (hitter, hitter_tag) || hitter->env != NULL)	920	if (hitter->destroyed () || hitter->env != NULL)
984	{	921	{
985	if (container)	922	if (container)
986	{	923	{
987	remove_ob (container);	924	container->remove ();
988	free_object (container);	925	container->destroy ();
989	}	926	}
		927
990	return NULL;	928	return 0;
991	}	929	}
992		930
993	/* Missile hit victim */	931	/* Missile hit victim */
994	/* if the speed is > 10, then this is a fast moving arrow, we go straight	932	/* if the speed is > 10, then this is a fast moving arrow, we go straight
995	* through the target	933	* through the target
996	*/	934	*/
997	if (hit_something && op->speed <= 10.0)	935	if (hit_something && op->speed <= 10.0)
998	{	936	{
999	/* Stop arrow */	937	/* Stop arrow */
1000	if (container == NULL)	938	if (!container)
1001	{	939	{
1002	hitter = fix_stopped_arrow (hitter);	940	hitter = fix_stopped_arrow (hitter);
1003	if (hitter == NULL)	941	if (!hitter)
1004	return NULL;	942	return 0;
1005	}	943	}
1006	else	944	else
1007	{	945	container->destroy ();
1008	remove_ob (container);
1009	free_object (container);
1010	}
1011		946
1012	/* Try to stick arrow into victim */	947	/* Try to stick arrow into victim */
1013	if (!was_destroyed (victim, victim_tag) && stick_arrow (hitter, victim))	948	if (!victim->destroyed () && stick_arrow (hitter, victim))
1014	return NULL;	949	return 0;
1015		950
1016	/* Else try to put arrow on victim's map square	951	/* Else try to put arrow on victim's map square
1017	* remove check for P_WALL here. If the arrow got to this	952	* remove check for P_WALL here. If the arrow got to this
1018	* space, that is good enough - with the new movement code,	953	* space, that is good enough - with the new movement code,
1019	* there is now the potential for lots of spaces where something	954	* there is now the potential for lots of spaces where something
1020	* can fly over but not otherwise move over. What is the correct	955	* can fly over but not otherwise move over. What is the correct
1021	* way to handle those otherwise?	956	* way to handle those otherwise?
1022	*/	957	*/
1023	if (victim_x != hitter->x || victim_y != hitter->y)	958	if (victim->x != hitter->x || victim->y != hitter->y)
1024	{	959	{
1025	remove_ob (hitter);	960	hitter->remove ();
1026	hitter->x = victim_x;	961	hitter->x = victim->x;
1027	hitter->y = victim_y;	962	hitter->y = victim->y;
1028	insert_ob_in_map (hitter, victim->map, hitter, 0);	963	insert_ob_in_map (hitter, victim->map, hitter, 0);
1029	}	964	}
1030	else	965	else
1031	{
1032	/* Else leave arrow where it is */	966	/* Else leave arrow where it is */
1033	merge_ob (hitter, NULL);	967	merge_ob (hitter, NULL);
1034	}	968
1035	return NULL;	969	return 0;
1036	}	970	}
1037		971
1038	if (hit_something && op->speed >= 10.0)	972	if (hit_something && op->speed >= 10.0)
1039	op->speed -= 1.0;	973	op->speed -= 1.0;
1040		974
1041	/* Missile missed victim - reassemble missile */	975	/* Missile missed victim - reassemble missile */
1042	if (container)	976	if (container)
1043	{	977	{
1044	remove_ob (hitter);	978	hitter->remove ();
1045	insert_ob_in_ob (hitter, container);	979	insert_ob_in_ob (hitter, container);
1046	}	980	}
		981
1047	return op;	982	return op;
1048	}	983	}
1049
1050		984
1051	void	985	void
1052	tear_down_wall (object *op)	986	tear_down_wall (object *op)
1053	{	987	{
1054	int perc = 0;	988	int perc = 0;
…		…
1060	}	994	}
1061	else if (!GET_ANIM_ID (op))	995	else if (!GET_ANIM_ID (op))
1062	{	996	{
1063	/* Object has been called - no animations, so remove it */	997	/* Object has been called - no animations, so remove it */
1064	if (op->stats.hp < 0)	998	if (op->stats.hp < 0)
		999	op->destroy ();
1065	{	1000
1066	remove_ob (op); /* Should update LOS */
1067	free_object (op);
1068	/* Don't know why this is here - remove_ob should do it for us */
1069	/*update_position(m, x, y); */
1070	}
1071	return; /* no animations, so nothing more to do */	1001	return; /* no animations, so nothing more to do */
1072	}	1002	}
		1003
1073	perc = NUM_ANIMATIONS (op) - ((int) NUM_ANIMATIONS (op) * op->stats.hp) / op->stats.maxhp;	1004	perc = NUM_ANIMATIONS (op) - ((int) NUM_ANIMATIONS (op) * op->stats.hp) / op->stats.maxhp;
		1005
1074	if (perc >= (int) NUM_ANIMATIONS (op))	1006	if (perc >= (int) NUM_ANIMATIONS (op))
1075	perc = NUM_ANIMATIONS (op) - 1;	1007	perc = NUM_ANIMATIONS (op) - 1;
1076	else if (perc < 1)	1008	else if (perc < 1)
1077	perc = 1;	1009	perc = 1;
		1010
1078	SET_ANIMATION (op, perc);	1011	SET_ANIMATION (op, perc);
1079	update_object (op, UP_OBJ_FACE);	1012	update_object (op, UP_OBJ_FACE);
		1013
1080	if (perc == NUM_ANIMATIONS (op) - 1)	1014	if (perc == NUM_ANIMATIONS (op) - 1)
1081	{ /* Reached the last animation */	1015	{ /* Reached the last animation */
1082	if (op->face == blank_face)	1016	if (op->face == blank_face)
1083	{
1084	/* If the last face is blank, remove the ob */	1017	/* If the last face is blank, remove the ob */
1085	remove_ob (op); /* Should update LOS */	1018	op->destroy ();
1086	free_object (op);
1087
1088	/* remove_ob should call update_position for us */
1089	/*update_position(m, x, y); */
1090
1091	}
1092	else	1019	else
1093	{ /* The last face was not blank, leave an image */	1020	{ /* The last face was not blank, leave an image */
1094	CLEAR_FLAG (op, FLAG_BLOCKSVIEW);	1021	CLEAR_FLAG (op, FLAG_BLOCKSVIEW);
1095	update_all_los (op->map, op->x, op->y);	1022	update_all_los (op->map, op->x, op->y);
1096	op->move_block = 0;	1023	op->move_block = 0;
…		…
1100	}	1027	}
1101		1028
1102	void	1029	void
1103	scare_creature (object *target, object *hitter)	1030	scare_creature (object *target, object *hitter)
1104	{	1031	{
1105	object *owner = get_owner (hitter);	1032	object *owner = hitter->owner;
1106		1033
1107	if (!owner)	1034	if (!owner)
1108	owner = hitter;	1035	owner = hitter;
1109		1036
1110	SET_FLAG (target, FLAG_SCARED);	1037	SET_FLAG (target, FLAG_SCARED);
1111	if (!target->enemy)	1038	if (!target->enemy)
1112	target->enemy = owner;	1039	target->enemy = owner;
1113	}	1040	}
1114
1115		1041
1116	/* This returns the amount of damage hitter does to op with the	1042	/* This returns the amount of damage hitter does to op with the
1117	* appropriate attacktype. Only 1 attacktype should be set at a time.	1043	* appropriate attacktype. Only 1 attacktype should be set at a time.
1118	* This doesn't damage the player, but returns how much it should	1044	* This doesn't damage the player, but returns how much it should
1119	* take. However, it will do other effects (paralyzation, slow, etc.)	1045	* take. However, it will do other effects (paralyzation, slow, etc.)
1120	* Note - changed for PR code - we now pass the attack number and not	1046	* Note - changed for PR code - we now pass the attack number and not
1121	* the attacktype. Makes it easier for the PR code. */	1047	* the attacktype. Makes it easier for the PR code. */
1122
1123	int	1048	int
1124	hit_player_attacktype (object *op, object *hitter, int dam, uint32 attacknum, int magic)	1049	hit_player_attacktype (object *op, object *hitter, int dam, uint32 attacknum, int magic)
1125	{	1050	{
1126
1127	int doesnt_slay = 1;	1051	int doesnt_slay = 1;
1128		1052
1129	/* Catch anyone that may be trying to send us a bitmask instead of the number */	1053	/* Catch anyone that may be trying to send us a bitmask instead of the number */
1130	if (attacknum >= NROFATTACKS)	1054	if (attacknum >= NROFATTACKS)
1131	{	1055	{
…		…
1133	return 0;	1057	return 0;
1134	}	1058	}
1135		1059
1136	if (dam < 0)	1060	if (dam < 0)
1137	{	1061	{
1138	LOG (llevError, "hit_player_attacktype called with negative damage: %d\n", dam);	1062	LOG (llevError, "hit_player_attacktype called with negative damage %d (hitter %s, target %s)\n",
		1063	dam, hitter->debug_desc (), op->debug_desc ());
1139	return 0;	1064	return 0;
1140	}	1065	}
1141		1066
1142	/* AT_INTERNAL is supposed to do exactly dam. Put a case here so	1067	/* AT_INTERNAL is supposed to do exactly dam. Put a case here so
1143	* people can't mess with that or it otherwise get confused. */	1068	* people can't mess with that or it otherwise get confused. */
1144	if (attacknum == ATNR_INTERNAL)	1069	if (attacknum == ATNR_INTERNAL)
1145	return dam;	1070	return dam;
1146		1071
1147	if (hitter->slaying)	1072	if (hitter->slaying)
1148	{	1073	{
1149	if (((op->race != NULL) && strstr (hitter->slaying, op->race)) ||	1074	if ((op->race && strstr (hitter->slaying, op->race))
1150	(op->arch && (op->arch->name != NULL) && strstr (op->arch->name, hitter->slaying)))	1075	|| (op->arch && op->arch->archname && strstr (op->arch->archname, hitter->slaying)))
1151	{	1076	{
1152	doesnt_slay = 0;	1077	doesnt_slay = 0;
1153	dam *= 3;	1078	dam *= 3;
1154	}	1079	}
1155	}	1080	}
…		…
1169	/* Special hack. By default, if immune to something, you	1094	/* Special hack. By default, if immune to something, you
1170	* shouldn't need to worry. However, acid is an exception, since	1095	* shouldn't need to worry. However, acid is an exception, since
1171	* it can still damage your items. Only include attacktypes if	1096	* it can still damage your items. Only include attacktypes if
1172	* special processing is needed */	1097	* special processing is needed */
1173		1098
1174	if ((op->resist[attacknum] >= 100) && doesnt_slay && (attacknum != ATNR_ACID))	1099	if (op->resist[attacknum] >= 100
		1100	&& doesnt_slay
		1101	&& attacknum != ATNR_ACID)
1175	return 0;	1102	return 0;
1176		1103
1177	/* Keep this in order - makes things easier to find */	1104	/* Keep this in order - makes things easier to find */
1178		1105
1179	switch (attacknum)	1106	switch (attacknum)
1180	{	1107	{
1181	case ATNR_PHYSICAL:	1108	case ATNR_PHYSICAL:
1182	/* here also check for diseases */	1109	/* here also check for diseases */
1183	check_physically_infect (op, hitter);	1110	check_physically_infect (op, hitter);
1184	break;	1111	break;
1185		1112
1186	/* Don't need to do anything for:	1113	/* Don't need to do anything for:
1187	magic,	1114	magic,
1188	fire,	1115	fire,
1189	electricity,	1116	electricity,
1190	cold */	1117	cold */
1191		1118
1192	case ATNR_CONFUSION:	1119	case ATNR_CONFUSION:
1193	case ATNR_POISON:	1120	case ATNR_POISON:
1194	case ATNR_SLOW:	1121	case ATNR_SLOW:
1195	case ATNR_PARALYZE:	1122	case ATNR_PARALYZE:
1196	case ATNR_FEAR:	1123	case ATNR_FEAR:
1197	case ATNR_CANCELLATION:	1124	case ATNR_CANCELLATION:
1198	case ATNR_DEPLETE:	1125	case ATNR_DEPLETE:
1199	case ATNR_BLIND:	1126	case ATNR_BLIND:
1200	{	1127	{
1201	/* chance for inflicting a special attack depends on the	1128	/* chance for inflicting a special attack depends on the
1202	* difference between attacker's and defender's level	1129	* difference between attacker's and defender's level
1203	*/	1130	*/
1204	int level_diff = MIN (110, MAX (0, op->level - hitter->level));	1131	int level_diff = MIN (110, MAX (0, op->level - hitter->level));
1205		1132
1206	/* First, only creatures/players with speed can be affected.	1133	/* First, only creatures/players with speed can be affected.
1207	* Second, just getting hit doesn't mean it always affects	1134	* Second, just getting hit doesn't mean it always affects
1208	* you. Third, you still get a saving through against the	1135	* you. Third, you still get a saving through against the
1209	* effect.	1136	* effect.
1210	*/	1137	*/
1211	if (op->speed &&	1138	if (op->speed &&
1212	(QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER) &&	1139	(QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER) &&
1213	!(rndm (0, (attacknum == ATNR_SLOW ? 6 : 3) - 1)) && !did_make_save (op, level_diff, op->resist[attacknum] / 10))	1140	!(rndm (0, (attacknum == ATNR_SLOW ? 6 : 3) - 1)) && !did_make_save (op, level_diff, op->resist[attacknum] / 10))
1214	{	1141	{
1215		1142
1216	/* Player has been hit by something */	1143	/* Player has been hit by something */
1217	if (attacknum == ATNR_CONFUSION)	1144	if (attacknum == ATNR_CONFUSION)
1218	confuse_player (op, hitter, dam);	1145	confuse_player (op, hitter, dam);
1219	else if (attacknum == ATNR_POISON)	1146	else if (attacknum == ATNR_POISON)
1220	poison_player (op, hitter, dam);	1147	poison_player (op, hitter, dam);
1221	else if (attacknum == ATNR_SLOW)	1148	else if (attacknum == ATNR_SLOW)
1222	slow_player (op, hitter, dam);	1149	slow_player (op, hitter, dam);
1223	else if (attacknum == ATNR_PARALYZE)	1150	else if (attacknum == ATNR_PARALYZE)
1224	paralyze_player (op, hitter, dam);	1151	paralyze_player (op, hitter, dam);
1225	else if (attacknum == ATNR_FEAR)	1152	else if (attacknum == ATNR_FEAR)
1226	scare_creature (op, hitter);	1153	scare_creature (op, hitter);
1227	else if (attacknum == ATNR_CANCELLATION)	1154	else if (attacknum == ATNR_CANCELLATION)
1228	cancellation (op);	1155	cancellation (op);
1229	else if (attacknum == ATNR_DEPLETE)	1156	else if (attacknum == ATNR_DEPLETE)
1230	drain_stat (op);	1157	op->drain_stat ();
1231	else if (attacknum == ATNR_BLIND && !QUERY_FLAG (op, FLAG_UNDEAD) && !QUERY_FLAG (op, FLAG_GENERATOR))	1158	else if (attacknum == ATNR_BLIND && !QUERY_FLAG (op, FLAG_UNDEAD) && !QUERY_FLAG (op, FLAG_GENERATOR))
1232	blind_player (op, hitter, dam);	1159	blind_player (op, hitter, dam);
1233	}	1160	}
		1161
1234	dam = 0; /* These are all effects and don't do real damage */	1162	dam = 0; /* These are all effects and don't do real damage */
1235	}	1163	}
1236	break;	1164	break;
		1165
1237	case ATNR_ACID:	1166	case ATNR_ACID:
1238	{	1167	{
1239	int flag = 0;	1168	int flag = 0;
1240		1169
1241	/* Items only get corroded if you're not on a battleground and	1170	/* Items only get corroded if you're not on a battleground and
1242	* if your acid resistance is below 50%. */	1171	* if your acid resistance is below 50%. */
1243	if (!op_on_battleground (op, NULL, NULL) && (op->resist[ATNR_ACID] < 50))	1172	if (!op_on_battleground (op, NULL, NULL) && (op->resist[ATNR_ACID] < 50))
1244	{	1173	{
1245	object *tmp;
1246
1247	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1174	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1248	{	1175	{
1249	if (tmp->invisible)	1176	if (tmp->invisible)
1250	continue;	1177	continue;
1251	if (!QUERY_FLAG (tmp, FLAG_APPLIED) || (tmp->resist[ATNR_ACID] >= 10))	1178	if (!QUERY_FLAG (tmp, FLAG_APPLIED) || (tmp->resist[ATNR_ACID] >= 10))
1252	/* >= 10% acid res. on itmes will protect these */	1179	/* >= 10% acid res. on items will protect these */
1253	continue;	1180	continue;
1254	if (!(tmp->material & M_IRON))	1181	if (!(tmp->materials & M_IRON))
1255	continue;	1182	continue;
1256	if (tmp->magic < -4) /* Let's stop at -5 */	1183	if (tmp->magic < -4) /* Let's stop at -5 */
1257	continue;	1184	continue;
1258	if (tmp->type == RING ||	1185	if (tmp->type == RING
1259	/* removed boots and gloves from exclusion list in	1186	/* removed boots and gloves from exclusion list in PR */
1260	PR */	1187	|| tmp->type == GIRDLE
1261	tmp->type == GIRDLE || tmp->type == AMULET || tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)	1188	|| tmp->type == AMULET
		1189	|| tmp->type == WAND
		1190	|| tmp->type == ROD
		1191	|| tmp->type == HORN)
1262	continue; /* To avoid some strange effects */	1192	continue; /* To avoid some strange effects */
1263		1193
1264	/* High damage acid has better chance of corroding	1194	/* High damage acid has better chance of corroding
1265	objects */	1195	objects */
1266	if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic)	1196	if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic)
		1197	{
		1198	flag = 1;
		1199	tmp->magic--;
		1200
		1201	if (object *pl = tmp->visible_to ())
1267	{	1202	{
1268	if (op->type == PLAYER)
1269	/* Make this more visible */	1203	/* Make this more visible */
1270	new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op,	1204	new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, pl,
1271	"The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp));	1205	"The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp));
1272	flag = 1;	1206
1273	tmp->magic--;	1207	esrv_send_item (op, tmp); //TODO: UPD_NAME should be enough (it's enough in other cases)
1274	if (op->type == PLAYER)
1275	esrv_send_item (op, tmp);
1276	}	1208	}
1277	}	1209	}
1278	if (flag)	1210	}
1279	fix_player (op); /* Something was corroded */
1280	}	1211
		1212	if (flag)
		1213	op->update_stats (); /* Something was corroded */
1281	}	1214	}
		1215	}
1282	break;	1216	break;
		1217
1283	case ATNR_DRAIN:	1218	case ATNR_DRAIN:
1284	{	1219	{
1285	/* rate is the proportion of exp drained. High rate means	1220	/* rate is the proportion of exp drained. High rate means
1286	* not much is drained, low rate means a lot is drained.	1221	* not much is drained, low rate means a lot is drained.
1287	*/	1222	*/
1288	int rate;	1223	int rate;
1289		1224
1290	if (op->resist[ATNR_DRAIN] >= 0)	1225	if (op->resist[ATNR_DRAIN] >= 0)
1291	rate = 400 + op->resist[ATNR_DRAIN] * 3;	1226	rate = 400 + op->resist[ATNR_DRAIN] * 3;
1292	else	1227	else
1293	rate = 400 * 100 / (100 - op->resist[ATNR_DRAIN]);	1228	rate = 400 * 100 / (100 - op->resist[ATNR_DRAIN]);
1294		1229
1295	if (op->stats.exp <= rate)	1230	if (op->stats.exp <= rate)
1296	{	1231	{
1297	if (op->type == GOLEM)	1232	if (op->type == GOLEM)
1298	dam = 999; /* Its force is "sucked" away. 8) */	1233	dam = 999; /* Its force is "sucked" away. 8) */
1299	else	1234	else
1300	/* If we can't drain, lets try to do physical damage */	1235	/* If we can't drain, lets try to do physical damage */
1301	dam = hit_player_attacktype (op, hitter, dam, ATNR_PHYSICAL, magic);	1236	dam = hit_player_attacktype (op, hitter, dam, ATNR_PHYSICAL, magic);
1302	}	1237	}
1303	else	1238	else
1304	{	1239	{
1305	/* Randomly give the hitter some hp */	1240	/* Randomly give the hitter some hp */
1306	if (hitter->stats.hp < hitter->stats.maxhp &&	1241	if (hitter->stats.hp < hitter->stats.maxhp &&
1307	(op->level > hitter->level) && random_roll (0, (op->level - hitter->level + 2), hitter, PREFER_HIGH) > 3)	1242	(op->level > hitter->level) && random_roll (0, (op->level - hitter->level + 2), hitter, PREFER_HIGH) > 3)
1308	hitter->stats.hp++;	1243	hitter->stats.hp++;
1309		1244
1310	/* Can't do drains on battleground spaces.	1245	/* Can't do drains on battleground spaces.
1311	* Move the wiz check up here - before, the hitter wouldn't gain exp	1246	* Move the wiz check up here - before, the hitter wouldn't gain exp
1312	* exp, but the wiz would still lose exp! If drainee is a wiz,	1247	* exp, but the wiz would still lose exp! If drainee is a wiz,
1313	* nothing happens.	1248	* nothing happens.
1314	* Try to credit the owner. We try to display player -> player drain	1249	* Try to credit the owner. We try to display player -> player drain
1315	* attacks, hence all the != PLAYER checks.	1250	* attacks, hence all the != PLAYER checks.
1316	*/	1251	*/
1317	if (!op_on_battleground (hitter, NULL, NULL) && !QUERY_FLAG (op, FLAG_WAS_WIZ))	1252	if (!op_on_battleground (hitter, NULL, NULL) && !QUERY_FLAG (op, FLAG_WIZ))
1318	{	1253	{
1319	object *owner = get_owner (hitter);	1254	object *owner = hitter->owner;
1320		1255
1321	if (owner && owner != hitter)	1256	if (owner && owner != hitter)
1322	{	1257	{
1323	if (op->type != PLAYER || owner->type != PLAYER)	1258	if (op->type != PLAYER || owner->type != PLAYER)
1324	change_exp (owner, op->stats.exp / (rate * 2),	1259	change_exp (owner, op->stats.exp / (rate * 2),
1325	hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, SK_EXP_TOTAL);	1260	hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, SK_EXP_TOTAL);
1326	}	1261	}
1327	else if (op->type != PLAYER || hitter->type != PLAYER)	1262	else if (op->type != PLAYER || hitter->type != PLAYER)
1328	{
1329	change_exp (hitter, op->stats.exp / (rate * 2),	1263	change_exp (hitter, op->stats.exp / (rate * 2),
1330	hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, 0);	1264	hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, 0);
1331	}	1265
1332	change_exp (op, -op->stats.exp / rate, NULL, 0);	1266	change_exp (op, -op->stats.exp / rate, NULL, 0);
1333	}	1267	}
		1268
1334	dam = 1; /* Drain is an effect. Still return 1 - otherwise, if you have pure	1269	dam = 1; /* Drain is an effect. Still return 1 - otherwise, if you have pure
1335	* drain attack, you won't know that you are actually sucking out EXP,	1270	* drain attack, you won't know that you are actually sucking out EXP,
1336	* as the messages will say you missed	1271	* as the messages will say you missed
1337	*/	1272	*/
1338	}	1273	}
1339	}	1274	}
1340	break;	1275	break;
		1276
1341	case ATNR_TURN_UNDEAD:	1277	case ATNR_TURN_UNDEAD:
1342	{	1278	{
1343	if (QUERY_FLAG (op, FLAG_UNDEAD))	1279	if (QUERY_FLAG (op, FLAG_UNDEAD))
1344	{	1280	{
1345	object *owner = hitter->owner ? (object *)hitter->owner : hitter;	1281	object *owner = hitter->owner ? (object *)hitter->owner : hitter;
1346	object *god = find_god (determine_god (owner));	1282	object *god = find_god (determine_god (owner));
1347	int div = 1;	1283	int div = 1;
1348		1284
1349	/* if undead are not an enemy of your god, you turn them	1285	/* if undead are not an enemy of your god, you turn them
1350	* at half strength */	1286	* at half strength */
1351	if (!god || !god->slaying || strstr (god->slaying, undead_name) == NULL)	1287	if (!god || !god->slaying || strstr (god->slaying, shstr_undead) == NULL)
1352	div = 2;	1288	div = 2;
		1289
1353	/* Give a bonus if you resist turn undead */	1290	/* Give a bonus if you resist turn undead */
1354	if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100)))	1291	if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100)))
1355	scare_creature (op, owner);	1292	scare_creature (op, owner);
1356	}	1293	}
1357	else	1294	else
1358	dam = 0; /* don't damage non undead - should we damage	1295	dam = 0; /* don't damage non undead - should we damage
1359	undead? */	1296	undead? */
1360	}	1297	}
1361	break;	1298	break;
		1299
1362	case ATNR_DEATH:	1300	case ATNR_DEATH:
1363	deathstrike_player (op, hitter, &dam);	1301	deathstrike_player (op, hitter, &dam);
1364	break;	1302	break;
		1303
1365	case ATNR_CHAOS:	1304	case ATNR_CHAOS:
1366	LOG (llevError, "%s was hit by %s with non-specific chaos.\n", query_name (op), query_name (hitter));	1305	LOG (llevError, "%s was hit by %s with non-specific chaos.\n", op->debug_desc (), hitter->debug_desc ());
1367	dam = 0;	1306	dam = 0;
1368	break;	1307	break;
		1308
1369	case ATNR_COUNTERSPELL:	1309	case ATNR_COUNTERSPELL:
1370	LOG (llevError, "%s was hit by %s with counterspell attack.\n", query_name (op), query_name (hitter));	1310	LOG (llevError, "%s was hit by %s with counterspell attack.\n", op->debug_desc (), hitter->debug_desc ());
1371	dam = 0;	1311	dam = 0;
1372	/* This should never happen. Counterspell is handled	1312	/* This should never happen. Counterspell is handled
1373	* seperately and filtered out. If this does happen,	1313	* seperately and filtered out. If this does happen,
1374	* Counterspell has no effect on anything but spells, so it	1314	* Counterspell has no effect on anything but spells, so it
1375	* does no damage. */	1315	* does no damage. */
1376	break;	1316	break;
		1317
1377	case ATNR_HOLYWORD:	1318	case ATNR_HOLYWORD:
1378	{	1319	{
1379	/* This has already been handled by hit_player,	1320	/* This has already been handled by hit_player,
1380	* no need to check twice -- DAMN */	1321	* no need to check twice -- DAMN */
1381	object *owner = hitter->owner ? (object *)hitter->owner : hitter;	1322	object *owner = hitter->owner ? (object *)hitter->owner : hitter;
1382		1323
1383	/* As with turn undead above, give a bonus on the saving throw */	1324	/* As with turn undead above, give a bonus on the saving throw */
1384	if ((op->level + (op->resist[ATNR_HOLYWORD] / 100)) < owner->level + turn_bonus[owner->stats.Wis])	1325	if ((op->level + (op->resist[ATNR_HOLYWORD] / 100)) < owner->level + turn_bonus[owner->stats.Wis])
1385	scare_creature (op, owner);	1326	scare_creature (op, owner);
1386	}	1327	}
1387	break;	1328	break;
		1329
1388	case ATNR_LIFE_STEALING:	1330	case ATNR_LIFE_STEALING:
1389	{	1331	{
1390	int new_hp;	1332	int new_hp;
1391		1333
1392	/* this is replacement to drain for players, instead of taking	1334	/* this is replacement to drain for players, instead of taking
1393	* exp it takes hp. It is geared for players, probably not	1335	* exp it takes hp. It is geared for players, probably not
1394	* much use giving it to monsters	1336	* much use giving it to monsters
1395	*	1337	*
1396	* life stealing doesn't do a lot of damage, but it gives the	1338	* life stealing doesn't do a lot of damage, but it gives the
1397	* damage it does do to the player. Given that,	1339	* damage it does do to the player. Given that,
1398	* it only does 1/10'th normal damage (hence the divide by	1340	* it only does 1/10'th normal damage (hence the divide by
1399	* 1000).	1341	* 1000).
1400	*/	1342	*/
1401	/* You can't steal life from something undead */	1343	/* You can't steal life from something undead */
1402	if ((op->type == GOLEM) || (QUERY_FLAG (op, FLAG_UNDEAD)))	1344	if ((op->type == GOLEM) || (QUERY_FLAG (op, FLAG_UNDEAD)))
1403	return 0;	1345	return 0;
		1346
1404	/* If drain protection is higher than life stealing, use that */	1347	/* If drain protection is higher than life stealing, use that */
1405	if (op->resist[ATNR_DRAIN] >= op->resist[ATNR_LIFE_STEALING])	1348	if (op->resist[ATNR_DRAIN] >= op->resist[ATNR_LIFE_STEALING])
1406	dam = (dam * (100 - op->resist[ATNR_DRAIN])) / 3000;	1349	dam = (dam * (100 - op->resist[ATNR_DRAIN])) / 3000;
1407	else	1350	else
1408	dam = (dam * (100 - op->resist[ATNR_LIFE_STEALING])) / 3000;	1351	dam = (dam * (100 - op->resist[ATNR_LIFE_STEALING])) / 3000;
		1352
1409	/* You die at -1 hp, not zero. */	1353	/* You die at -1 hp, not zero. */
1410	if (dam > (op->stats.hp + 1))	1354	if (dam > (op->stats.hp + 1))
1411	dam = op->stats.hp + 1;	1355	dam = op->stats.hp + 1;
		1356
1412	new_hp = hitter->stats.hp + dam;	1357	new_hp = hitter->stats.hp + dam;
1413	if (new_hp > hitter->stats.maxhp)	1358	if (new_hp > hitter->stats.maxhp)
1414	new_hp = hitter->stats.maxhp;	1359	new_hp = hitter->stats.maxhp;
		1360
1415	if (new_hp > hitter->stats.hp)	1361	if (new_hp > hitter->stats.hp)
1416	hitter->stats.hp = new_hp;	1362	hitter->stats.hp = new_hp;
1417	}	1363	}
1418	}	1364	}
		1365
1419	return dam;	1366	return dam;
1420	}	1367	}
1421
1422		1368
1423	/* GROS: This code comes from hit_player. It has been made external to	1369	/* GROS: This code comes from hit_player. It has been made external to
1424	* allow script procedures to "kill" objects in a combat-like fashion.	1370	* allow script procedures to "kill" objects in a combat-like fashion.
1425	* It was initially used by (kill-object) developed for the Collector's	1371	* It was initially used by (kill-object) developed for the Collector's
1426	* Sword. Note that nothing has been changed from the original version	1372	* Sword. Note that nothing has been changed from the original version
…		…
1441	char buf[MAX_BUF];	1387	char buf[MAX_BUF];
1442	const char *skill;	1388	const char *skill;
1443	int maxdam = 0;	1389	int maxdam = 0;
1444	int battleg = 0; /* true if op standing on battleground */	1390	int battleg = 0; /* true if op standing on battleground */
1445	int pk = 0; /* true if op and what controls hitter are both players */	1391	int pk = 0; /* true if op and what controls hitter are both players */
1446	object *owner = NULL;	1392	object *owner = 0;
1447	object *skop = NULL;	1393	object *skop = 0;
1448		1394
1449	if (op->stats.hp >= 0)	1395	if (op->stats.hp >= 0)
1450	return -1;	1396	return -1;
1451		1397
1452	if (INVOKE_OBJECT (KILL, op, ARG_OBJECT (hitter)))	1398	if (INVOKE_OBJECT (KILL, op, ARG_OBJECT (hitter)))
…		…
1461	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW))	1407	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW))
1462	update_all_los (op->map, op->x, op->y); /* makes sure los will be recalculated */	1408	update_all_los (op->map, op->x, op->y); /* makes sure los will be recalculated */
1463		1409
1464	if (op->type == DOOR)	1410	if (op->type == DOOR)
1465	{	1411	{
1466	op->speed = 0.1;	1412	op->set_speed (0.1f);
1467	update_ob_speed (op);
1468	op->speed_left = -0.05;	1413	op->speed_left = -0.05f;
1469	return maxdam;	1414	return maxdam;
1470	}	1415	}
		1416
1471	if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER)	1417	if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER)
1472	{	1418	{
1473	remove_friendly_object (op);	1419	op->destroy ();
1474	if (get_owner (op) != NULL && op->owner->type == PLAYER && op->owner->contr->ranges[range_golem] == op)
1475	{
1476	op->owner->contr->ranges[range_golem] = NULL;
1477	op->owner->contr->golem_count = 0;
1478	}
1479
1480	remove_ob (op);
1481	free_object (op);
1482	return maxdam;	1420	return maxdam;
1483	}	1421	}
1484		1422
1485	/* Now lets start dealing with experience we get for killing something */	1423	/* Now lets start dealing with experience we get for killing something */
1486		1424
1487	owner = get_owner (hitter);	1425	owner = hitter->owner;
1488	if (owner == NULL)	1426	if (!owner)
1489	owner = hitter;	1427	owner = hitter;
1490		1428
1491	/* is the victim (op) standing on battleground? */	1429	/* is the victim (op) standing on battleground? */
1492	if (op_on_battleground (op, NULL, NULL))	1430	if (op_on_battleground (op, NULL, NULL))
1493	battleg = 1;	1431	battleg = 1;
…		…
1513	char buf[256];	1451	char buf[256];
1514		1452
1515	tmv = localtime (&t);	1453	tmv = localtime (&t);
1516	strftime (buf, 256, "%a %b %d %H:%M:%S %Y", tmv);	1454	strftime (buf, 256, "%a %b %d %H:%M:%S %Y", tmv);
1517		1455
1518	LOG (llevInfo, "%s PLAYER_KILL_PLAYER: %s (%s) killed %s\n", buf, &owner->name, owner->contr->socket.host, query_name (op));	1456	LOG (llevInfo, "%s PLAYER_KILL_PLAYER: %s (%s) killed %s\n", buf, &owner->name, owner->contr->ns->host, query_name (op));
1519	}	1457	}
1520		1458
1521	/* try to filter some things out - basically, if you are	1459	/* try to filter some things out - basically, if you are
1522	* killing a level 1 creature and your level 20, you	1460	* killing a level 1 creature and your level 20, you
1523	* probably don't want to see that.	1461	* probably don't want to see that.
1524	*/	1462	*/
1525	if (owner->level < op->level * 2 || op->stats.exp > 1000)	1463	if (owner->level < op->level * 2 || op->stats.exp > 1000)
1526	{	1464	{
1527	if (owner != hitter)	1465	if (owner != hitter)
1528	{
1529	new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s with %s.", query_name (op), query_name (hitter));	1466	new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s with %s.", query_name (op), query_name (hitter));
1530	}
1531	else	1467	else
1532	{
1533	new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op));	1468	new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op));
1534	}	1469
1535	/* Only play sounds for melee kills */	1470	/* Only play sounds for melee kills */
1536	if (hitter->type == PLAYER)	1471	if (hitter->type == PLAYER)
1537	play_sound_map (owner->map, owner->x, owner->y, SOUND_PLAYER_KILLS);	1472	owner->play_sound (sound_find ("player_kills"));
1538	}	1473	}
1539		1474
1540	/* If a player kills another player, not on	1475	/* If a player kills another player, not on
1541	* battleground, the "killer" looses 1 luck. Since this is	1476	* battleground, the "killer" looses 1 luck. Since this is
1542	* not reversible, it's actually quite a pain IMHO. -AV	1477	* not reversible, it's actually quite a pain IMHO. -AV
…		…
1544	* player that the object belonged to - so if you killed another player	1479	* player that the object belonged to - so if you killed another player
1545	* with spells, pets, whatever, there was no penalty.	1480	* with spells, pets, whatever, there was no penalty.
1546	* Changed to make luck penalty configurable in settings.	1481	* Changed to make luck penalty configurable in settings.
1547	*/	1482	*/
1548	if (op->type == PLAYER && owner != op && !battleg)	1483	if (op->type == PLAYER && owner != op && !battleg)
1549	change_luck (owner, -settings.pk_luck_penalty);	1484	owner->change_luck (-settings.pk_luck_penalty);
1550		1485
1551	/* This code below deals with finding the appropriate skill	1486	/* This code below deals with finding the appropriate skill
1552	* to credit exp to. This is a bit problematic - we should	1487	* to credit exp to. This is a bit problematic - we should
1553	* probably never really have to look at current_weapon->skill	1488	* probably never really have to look at current_weapon->skill
1554	*/	1489	*/
1555	skill = NULL;	1490	skill = 0;
		1491
1556	if (hitter->skill && hitter->type != PLAYER)	1492	if (hitter->skill && hitter->type != PLAYER)
1557	skill = hitter->skill;	1493	skill = hitter->skill;
1558	else if (owner->chosen_skill)	1494	else if (owner->chosen_skill)
1559	{	1495	{
1560	skill = owner->chosen_skill->skill;
1561	skop = owner->chosen_skill;	1496	skop = owner->chosen_skill;
		1497	skill = skop->skill;
1562	}	1498	}
1563	else if (QUERY_FLAG (owner, FLAG_READY_WEAPON))	1499	else if (QUERY_FLAG (owner, FLAG_READY_WEAPON))
1564	skill = owner->current_weapon->skill;	1500	skill = owner->current_weapon->skill;
1565	else	1501	else
1566	LOG (llevError, "kill_object - unable to find skill that killed monster\n");	1502	LOG (llevError, "kill_object - unable to find skill that killed monster\n");
1567		1503
1568	/* We have the skill we want to credit to - now find the object this goes	1504	/* We have the skill we want to credit to - now find the object this goes
1569	* to. Make sure skop is an actual skill, and not a skill tool!	1505	* to. Make sure skop is an actual skill, and not a skill tool!
1570	*/	1506	*/
1571	if ((!skop || skop->type != SKILL) && skill)	1507	if ((!skop || skop->type != SKILL) && skill)
1572	{	1508	{
1573	int i;	1509	int i;
1574		1510
…		…
1579	break;	1515	break;
1580	}	1516	}
1581	}	1517	}
1582	} /* Was it a player that hit somethign */	1518	} /* Was it a player that hit somethign */
1583	else	1519	else
1584	{
1585	skill = NULL;	1520	skill = 0;
1586	}
1587		1521
1588	/* Pet (or spell) killed something. */	1522	/* Pet (or spell) killed something. */
1589	if (owner != hitter)	1523	if (owner != hitter)
1590	{
1591	(void) sprintf (buf, "%s killed %s with %s%s%s.", &owner->name,	1524	sprintf (buf, "%s killed %s with %s%s%s.", &owner->name,
1592	query_name (op), query_name (hitter), battleg ? " (duel)" : "", pk ? " (pk)" : "");	1525	query_name (op), query_name (hitter), battleg ? " (duel)" : "", pk ? " (pk)" : "");
1593	}
1594	else	1526	else
1595	{
1596	(void) sprintf (buf, "%s killed %s%s%s%s.", &hitter->name, &op->name,	1527	sprintf (buf, "%s killed %s%s%s%s.", &hitter->name, &op->name,
1597	(QUERY_FLAG (hitter, FLAG_MONSTER)) || hitter->type == PLAYER ?	1528	(QUERY_FLAG (hitter, FLAG_MONSTER)) || hitter->type == PLAYER ?
1598	" in hand to hand combat" : "", battleg ? " (duel)" : "", pk ? " (pk)" : "");	1529	" in hand to hand combat" : "", battleg ? " (duel)" : "", pk ? " (pk)" : "");
1599	}	1530
1600	/* These may have been set in the player code section above */	1531	/* These may have been set in the player code section above */
1601	if (!skop)	1532	if (!skop)
1602	skop = hitter->chosen_skill;	1533	skop = hitter->chosen_skill;
		1534
1603	if (!skill && skop)	1535	if (!skill && skop)
1604	skill = skop->skill;	1536	skill = skop->skill;
1605		1537
1606	new_draw_info (NDI_ALL, op->type == PLAYER ? 1 : 10, NULL, buf);	1538	new_draw_info (NDI_ALL, op->type == PLAYER ? 1 : 10, NULL, buf);
1607		1539
1608
1609	/* If you didn't kill yourself, and your not the wizard */	1540	/* If you didn't kill yourself, and your not the wizard */
1610	if (owner != op && !QUERY_FLAG (op, FLAG_WAS_WIZ))	1541	if (owner != op && !QUERY_FLAG (op, FLAG_WIZ))
1611	{	1542	{
1612	int exp;	1543	int exp;
1613		1544
1614	/* Really don't give much experience for killing other players */	1545	/* Really don't give much experience for killing other players */
1615	// schmorp: temporary? reduce the amount of exp gained for pking enourmously	1546	// schmorp: temporarily? reduce the amount of exp gained for pking enourmously
1616	if (op->type == PLAYER)	1547	if (op->type == PLAYER)
1617	{	1548	{
1618	if (battleg)	1549	if (battleg)
1619	{	1550	{
1620	new_draw_info (NDI_UNIQUE, 0, owner, "Your foe has fallen!");	1551	new_draw_info (NDI_UNIQUE, 0, owner, "Your foe has fallen!");
…		…
1638		1569
1639	if (!settings.simple_exp)	1570	if (!settings.simple_exp)
1640	exp = exp / 2;	1571	exp = exp / 2;
1641		1572
1642	if (owner->type != PLAYER || owner->contr->party == NULL)	1573	if (owner->type != PLAYER || owner->contr->party == NULL)
1643	{
1644	change_exp (owner, exp, skill, 0);	1574	change_exp (owner, exp, skill, 0);
1645	}
1646	else	1575	else
1647	{	1576	{
1648	int shares = 0, count = 0;	1577	int shares = 0, count = 0;
1649
1650	player *pl;
1651
1652	partylist *party = owner->contr->party;	1578	partylist *party = owner->contr->party;
1653		1579
1654	#ifdef PARTY_KILL_LOG
1655	add_kill_to_party (party, query_name (owner), query_name (op), exp);	1580	add_kill_to_party (party, query_name (owner), query_name (op), exp);
1656	#endif	1581
1657	for (pl = first_player; pl != NULL; pl = pl->next)	1582	for_all_players (pl)
1658	{
1659	if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner))	1583	if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner))
1660	{	1584	{
1661	count++;	1585	count++;
1662	shares += (pl->ob->level + 4);	1586	shares += (pl->ob->level + 4);
1663	}	1587	}
1664	}	1588
1665	if (count == 1 || shares > exp)	1589	if (count == 1 || shares > exp || !shares)
1666	change_exp (owner, exp, skill, SK_EXP_TOTAL);	1590	change_exp (owner, exp, skill, SK_EXP_TOTAL);
1667	else	1591	else
1668	{	1592	{
1669	int share = exp / shares, given = 0, nexp;	1593	int share = exp / shares, given = 0, nexp;
1670		1594
1671	for (pl = first_player; pl != NULL; pl = pl->next)	1595	for_all_players (pl)
1672	{
1673	if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner))	1596	if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner))
1674	{	1597	{
1675	nexp = (pl->ob->level + 4) * share;	1598	nexp = (pl->ob->level + 4) * share;
1676	change_exp (pl->ob, nexp, skill, SK_EXP_TOTAL);	1599	change_exp (pl->ob, nexp, skill, SK_EXP_TOTAL);
1677	given += nexp;	1600	given += nexp;
1678	}	1601	}
1679	}	1602
1680	exp -= given;	1603	exp -= given;
1681	/* give any remainder to the player */	1604	/* give any remainder to the player */
1682	change_exp (owner, exp, skill, SK_EXP_ADD_SKILL);	1605	change_exp (owner, exp, skill, SK_EXP_ADD_SKILL);
1683	}	1606	}
1684	} /* else part of a party */	1607	} /* else part of a party */
1685
1686	} /* end if person didn't kill himself */	1608	} /* end if person didn't kill himself */
1687		1609
1688	if (op->type != PLAYER)	1610	if (op->type != PLAYER)
1689	{	1611	{
1690	if (QUERY_FLAG (op, FLAG_FRIENDLY))	1612	if (QUERY_FLAG (op, FLAG_FRIENDLY))
1691	{	1613	{
1692	object *owner1 = get_owner (op);	1614	object *owner1 = op->owner;
1693		1615
1694	if (owner1 != NULL && owner1->type == PLAYER)	1616	if (owner1 && owner1->type == PLAYER)
1695	{	1617	{
1696	play_sound_player_only (owner1->contr, SOUND_PET_IS_KILLED, 0, 0);	1618	owner1->contr->play_sound (sound_find ("pet_is_killed"));
1697	/* Maybe we should include the owner that killed this, maybe not */	1619	/* Maybe we should include the owner that killed this, maybe not */
1698	new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name);	1620	new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name);
1699	}	1621	}
1700		1622
1701	remove_friendly_object (op);	1623	remove_friendly_object (op);
1702	}	1624	}
1703		1625
1704	remove_ob (op);	1626	op->destroy ();
1705	free_object (op);
1706	}	1627	}
1707	/* Player has been killed! */
1708	else	1628	else
1709	{	1629	/* Player has been killed! */
1710	if (owner->type == PLAYER)	1630	op->contr->killer = owner->type == PLAYER ? owner : hitter;
1711	{
1712	snprintf (op->contr->killer, BIG_NAME, "%s the %s", &owner->name, owner->contr->title);
1713	}
1714	else
1715	assign (op->contr->killer, hitter->name);
1716	}
1717		1631
1718	/* This was return -1 - that doesn't seem correct - if we return -1, process	1632	/* This was return -1 - that doesn't seem correct - if we return -1, process
1719	* continues in the calling function.	1633	* continues in the calling function.
1720	*/	1634	*/
1721	return maxdam;	1635	return maxdam;
1722	}	1636	}
1723		1637
1724	/* Find out if this is friendly fire (PVP and attacker is peaceful) or not	1638	/* Find out if this is friendly fire (PVP and attacker is peaceful) or not
1725	* Returns 0 this is not friendly fire	1639	* Returns 0 this is not friendly fire
1726	*/	1640	*/
1727
1728	int	1641	int
1729	friendly_fire (object *op, object *hitter)	1642	friendly_fire (object *op, object *hitter)
1730	{	1643	{
1731	object *owner;	1644	object *owner;
1732	int friendlyfire;	1645	int friendlyfire;
…		…
1742	return 0;	1655	return 0;
1743		1656
1744	if (hitter->type == PLAYER && hitter->contr->peaceful == 1)	1657	if (hitter->type == PLAYER && hitter->contr->peaceful == 1)
1745	return 1;	1658	return 1;
1746		1659
1747	if ((owner = get_owner (hitter)) != NULL)	1660	if ((owner = hitter->owner) != NULL)
1748	{	1661	{
1749	if (owner->type == PLAYER && owner->contr->peaceful == 1)	1662	if (owner->type == PLAYER && owner->contr->peaceful == 1)
1750	friendlyfire = 2;	1663	friendlyfire = 2;
1751	}	1664	}
1752		1665
1753	if (hitter->type == SPELL || hitter->type == POISONING || hitter->type == DISEASE || hitter->type == RUNE)	1666	if (hitter->type == SPELL || hitter->type == POISONING || hitter->type == DISEASE || hitter->type == RUNE)
1754	friendlyfire = 0;	1667	friendlyfire = 0;
1755	}	1668	}
		1669
1756	return friendlyfire;	1670	return friendlyfire;
1757	}	1671	}
1758
1759		1672
1760	/* This isn't used just for players, but in fact most objects.	1673	/* This isn't used just for players, but in fact most objects.
1761	* op is the object to be hit, dam is the amount of damage, hitter	1674	* op is the object to be hit, dam is the amount of damage, hitter
1762	* is what is hitting the object, type is the attacktype, and	1675	* is what is hitting the object, type is the attacktype, and
1763	* full_hit is set if monster area does not matter.	1676	* full_hit is set if monster area does not matter.
1764	* dam is base damage - protections/vulnerabilities/slaying matches can	1677	* dam is base damage - protections/vulnerabilities/slaying matches can
1765	* modify it.	1678	* modify it.
1766	*/	1679	*/
1767
1768	/* Oct 95 - altered the following slightly for MULTIPLE_GODS hack	1680	/* Oct 95 - altered the following slightly for MULTIPLE_GODS hack
1769	* which needs new attacktype AT_HOLYWORD to work . b.t. */	1681	* which needs new attacktype AT_HOLYWORD to work . b.t. */
1770
1771	int	1682	int
1772	hit_player (object *op, int dam, object *hitter, int type, int full_hit)	1683	hit_player (object *op, int dam, object *hitter, int type, int full_hit)
1773	{	1684	{
1774	int maxdam = 0, ndam = 0, attacktype = 1, magic = (type & AT_MAGIC);	1685	int maxdam = 0, ndam = 0, attacktype = 1, magic = (type & AT_MAGIC);
1775	int maxattacktype, attacknum;	1686	int maxattacktype, attacknum;
1776	int body_attack = op && op->head; /* Did we hit op's head? */	1687	int body_attack = op && op->head; /* Did we hit op's head? */
1777	int simple_attack;	1688	int simple_attack;
1778	tag_t op_tag, hitter_tag;
1779	int rtn_kill = 0;	1689	int rtn_kill = 0;
1780	int friendlyfire;	1690	int friendlyfire;
1781		1691
1782	if (get_attack_mode (&op, &hitter, &simple_attack))	1692	if (get_attack_mode (&op, &hitter, &simple_attack))
1783	return 0;	1693	return 0;
1784		1694
1785	/* very simple: if our target has no_damage 1 set or is wiz, we can't hurt him */	1695	/* very simple: if our target has no_damage 1 set or is wiz, we can't hurt him */
1786	if (QUERY_FLAG (op, FLAG_WIZ) || QUERY_FLAG (op, FLAG_NO_DAMAGE))	1696	if (QUERY_FLAG (op, FLAG_WIZ) || QUERY_FLAG (op, FLAG_NO_DAMAGE))
1787	return 0;	1697	return 0;
1788		1698
1789	#ifdef PROHIBIT_PLAYERKILL	1699	// only allow pk for hostile players
1790	if (op->type == PLAYER)	1700	if (op->type == PLAYER)
1791	{	1701	{
1792	object *owner = get_owner (hitter);	1702	object *owner = hitter->owner;
1793		1703
1794	if (!owner)	1704	if (!owner)
1795	owner = hitter;	1705	owner = hitter;
1796	if (owner->type == PLAYER && (!op_on_battleground (op, 0, 0) && (op->contr->peaceful || owner->contr->peaceful)) && op != owner)	1706
1797	{	1707	if (owner->type == PLAYER
		1708	&& (!op_on_battleground (op, 0, 0)
		1709	&& (op->contr->peaceful || owner->contr->peaceful))
		1710	&& op != owner)
1798	return 0;	1711	return 0;
1799	}
1800	}	1712	}
1801	#endif
1802
1803	op_tag = op->count;
1804	hitter_tag = hitter->count;
1805		1713
1806	if (body_attack)	1714	if (body_attack)
1807	{	1715	{
1808	/* slow and paralyze must hit the head. But we don't want to just	1716	/* slow and paralyze must hit the head. But we don't want to just
1809	* return - we still need to process other attacks the spell still	1717	* return - we still need to process other attacks the spell still
…		…
1815	* attack so we don't cancel out things like magic bullet.	1723	* attack so we don't cancel out things like magic bullet.
1816	*/	1724	*/
1817	if (type & (AT_PARALYZE | AT_SLOW))	1725	if (type & (AT_PARALYZE | AT_SLOW))
1818	{	1726	{
1819	type &= ~(AT_PARALYZE | AT_SLOW);	1727	type &= ~(AT_PARALYZE | AT_SLOW);
		1728
1820	if (!type || type == AT_MAGIC)	1729	if (!type || type == AT_MAGIC)
1821	return 0;	1730	return 0;
1822	}	1731	}
1823	}	1732	}
1824		1733
1825	if (!simple_attack && op->type == DOOR)	1734	if (!simple_attack && op->type == DOOR)
1826	{	1735	{
1827	object *tmp;
1828
1829	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1736	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1830	if (tmp->type == RUNE || tmp->type == TRAP)	1737	if (tmp->type == RUNE || tmp->type == TRAP)
1831	{	1738	{
1832	spring_trap (tmp, hitter);	1739	spring_trap (tmp, hitter);
		1740
1833	if (was_destroyed (hitter, hitter_tag) || was_destroyed (op, op_tag) || abort_attack (op, hitter, simple_attack))	1741	if (hitter->destroyed () || op->destroyed () || abort_attack (op, hitter, simple_attack))
1834	return 0;	1742	return 0;
		1743
1835	break;	1744	break;
1836	}	1745	}
1837	}	1746	}
1838		1747
1839	if (!QUERY_FLAG (op, FLAG_ALIVE) || op->stats.hp < 0)	1748	if (!QUERY_FLAG (op, FLAG_ALIVE) || op->stats.hp < 0)
1840	{	1749	{
1841	/* FIXME: If a player is killed by a rune in a door, the	1750	/* FIXME: If a player is killed by a rune in a door, the
1842	* was_destroyed() check above doesn't return, and might get here.	1751	* destroyed() check above doesn't return, and might get here.
1843	*/	1752	*/
		1753
		1754	/* FIXME: This for example happens when a dead door is on a mover and
		1755	gets it's speed_left raised on each mover-tick.
		1756	Doors are removed in a kinda funny way by giving them speed and speed_left
		1757	and waiting for that to run out.
		1758	*/
1844	LOG (llevDebug, "victim (arch %s, name %s) already dead in " "hit_player()\n", &op->arch->name, &op->name);	1759	LOG (llevDebug, "victim %s (%d) already dead in hit_player()\n", op->debug_desc (), op->stats.hp);
1845	return 0;	1760	return 0;
1846	}	1761	}
1847		1762
1848	#ifdef ATTACK_DEBUG	1763	#ifdef ATTACK_DEBUG
1849	LOG (llevDebug, "hit player: attacktype %d, dam %d\n", type, dam);	1764	LOG (llevDebug, "hit player: attacktype %d, dam %d\n", type, dam);
…		…
1855	* in case 0>dam>1, we try to "simulate" a float value-effect */	1770	* in case 0>dam>1, we try to "simulate" a float value-effect */
1856	dam = dam * (100 - op->resist[ATNR_MAGIC]);	1771	dam = dam * (100 - op->resist[ATNR_MAGIC]);
1857	if (dam >= 100)	1772	if (dam >= 100)
1858	dam /= 100;	1773	dam /= 100;
1859	else	1774	else
1860	dam = (dam > (rndm (0, 99))) ? 1 : 0;	1775	dam = (dam > rndm (0, 99)) ? 1 : 0;
1861	}	1776	}
1862		1777
1863	/* AT_CHAOS here is a weapon or monster. Spells are handled by hit_map	1778	/* AT_CHAOS here is a weapon or monster. Spells are handled by hit_map
1864	* If the attacktype still has chaos, shuffle it, then clear the Chaos bit	1779	* If the attacktype still has chaos, shuffle it, then clear the Chaos bit
1865	*/	1780	*/
…		…
1881	if ((!hitter->slaying ||	1796	if ((!hitter->slaying ||
1882	(!(op->race && strstr (hitter->slaying, op->race)) &&	1797	(!(op->race && strstr (hitter->slaying, op->race)) &&
1883	!(op->name && strstr (hitter->slaying, op->name)))) &&	1798	!(op->name && strstr (hitter->slaying, op->name)))) &&
1884	(!QUERY_FLAG (op, FLAG_UNDEAD) ||	1799	(!QUERY_FLAG (op, FLAG_UNDEAD) ||
1885	(hitter->title != NULL	1800	(hitter->title != NULL
1886	&& (god = find_god (determine_god (hitter))) != NULL && god->race != NULL && strstr (god->race, undead_name) != NULL)))	1801	&& (god = find_god (determine_god (hitter))) != NULL && god->race != NULL && strstr (god->race, shstr_undead) != NULL)))
1887	return 0;	1802	return 0;
1888	}	1803	}
1889		1804
1890	maxattacktype = type; /* initialize this to something */	1805	maxattacktype = type; /* initialise this to something */
1891	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum)	1806	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum)
1892	{	1807	{
1893	/* Magic isn't really a true attack type - it gets combined with other	1808	/* Magic isn't really a true attack type - it gets combined with other
1894	* attack types. As such, skip it over. However, if magic is	1809	* attack types. As such, skip it over. However, if magic is
1895	* the only attacktype in the group, then still attack with it	1810	* the only attacktype in the group, then still attack with it
…		…
1923	*/	1838	*/
1924	friendlyfire = friendly_fire (op, hitter);	1839	friendlyfire = friendly_fire (op, hitter);
1925	if (friendlyfire && maxdam)	1840	if (friendlyfire && maxdam)
1926	{	1841	{
1927	maxdam = ((dam * settings.set_friendly_fire) / 100);	1842	maxdam = ((dam * settings.set_friendly_fire) / 100);
1928	#ifndef COZY_SERVER
1929	maxdam++;
1930	#endif
1931		1843
1932	#ifdef ATTACK_DEBUG	1844	#ifdef ATTACK_DEBUG
1933	LOG (llevDebug, "Friendly fire (type:%d setting: %d%) did %d damage dropped to %d\n",	1845	LOG (llevDebug, "Friendly fire (type:%d setting: %d%) did %d damage dropped to %d\n",
1934	friendlyfire, settings.set_friendly_fire, dam, maxdam);	1846	friendlyfire, settings.set_friendly_fire, dam, maxdam);
1935	#endif	1847	#endif
1936	}	1848	}
1937		1849
1938	if (!full_hit)	1850	if (!full_hit)
1939	{	1851	{
1940	archetype *at;
1941	int area;	1852	int area;
1942	int remainder;	1853	int remainder;
1943		1854
1944	area = 0;	1855	area = 0;
1945	for (at = op->arch; at != NULL; at = at->more)	1856
		1857	for (archetype *at = op->arch; at; at = (archetype *)at->more)
1946	area++;	1858	area++;
		1859
1947	assert (area > 0);	1860	assert (area > 0);
1948		1861
1949	/* basically: maxdam /= area; we try to "simulate" a float	1862	/* basically: maxdam /= area; we try to "simulate" a float
1950	value-effect */	1863	value-effect */
1951	remainder = 100 * (maxdam % area) / area;	1864	remainder = 100 * (maxdam % area) / area;
1952	maxdam /= area;	1865	maxdam /= area;
1953	if (RANDOM () % 100 < remainder)	1866	if (rndm (100) < remainder)
1954	maxdam++;	1867	maxdam++;
1955	}	1868	}
1956		1869
1957	#ifdef ATTACK_DEBUG	1870	#ifdef ATTACK_DEBUG
1958	LOG (llevDebug, "Attacktype %d did %d damage\n", type, maxdam);	1871	LOG (llevDebug, "Attacktype %d did %d damage\n", type, maxdam);
1959	#endif	1872	#endif
1960		1873
1961	if (get_owner (hitter))	1874	// for now, only do this for active objects, otherwise they
		1875	// keep a refcount for a long time and I see no usefulness
		1876	// for an non-active objetc to know its enemy.
		1877	if (op->active)
		1878	if (hitter->owner)
1962	op->enemy = hitter->owner;	1879	op->enemy = hitter->owner;
1963	else if (QUERY_FLAG (hitter, FLAG_ALIVE))	1880	else if (QUERY_FLAG (hitter, FLAG_ALIVE))
1964	op->enemy = hitter;	1881	op->enemy = hitter;
1965		1882
1966	if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE) && op->type != PLAYER)	1883	if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE) && op->type != PLAYER)
1967	{	1884	{
1968	/* The unaggressives look after themselves 8) */	1885	/* The unaggressives look after themselves 8) */
1969	CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);	1886	CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
…		…
1991		1908
1992	if (QUERY_FLAG (op, FLAG_TEAR_DOWN))	1909	if (QUERY_FLAG (op, FLAG_TEAR_DOWN))
1993	{	1910	{
1994	if (maxdam)	1911	if (maxdam)
1995	tear_down_wall (op);	1912	tear_down_wall (op);
		1913
1996	return maxdam; /* nothing more to do for wall */	1914	return maxdam; /* nothing more to do for wall */
1997	}	1915	}
1998		1916
1999	/* See if the creature has been killed */	1917	/* See if the creature has been killed */
2000	rtn_kill = kill_object (op, maxdam, hitter, type);	1918	rtn_kill = kill_object (op, maxdam, hitter, type);
…		…
2005	/* Used to be ghosthit removal - we now use the ONE_HIT flag. Note	1923	/* Used to be ghosthit removal - we now use the ONE_HIT flag. Note
2006	* that before if the player was immune to ghosthit, the monster	1924	* that before if the player was immune to ghosthit, the monster
2007	* remained - that is no longer the case.	1925	* remained - that is no longer the case.
2008	*/	1926	*/
2009	if (QUERY_FLAG (hitter, FLAG_ONE_HIT))	1927	if (QUERY_FLAG (hitter, FLAG_ONE_HIT))
2010	{	1928	hitter->destroy ();
2011	if (QUERY_FLAG (hitter, FLAG_FRIENDLY))	1929
2012	remove_friendly_object (hitter);
2013	remove_ob (hitter);
2014	free_object (hitter);
2015	}
2016	/* Lets handle creatures that are splitting now */	1930	/* Lets handle creatures that are splitting now */
2017	else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING))	1931	else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING))
2018	{	1932	{
2019	int i;	1933	int i;
2020	int friendly = QUERY_FLAG (op, FLAG_FRIENDLY);	1934	int friendly = QUERY_FLAG (op, FLAG_FRIENDLY);
2021	int unaggressive = QUERY_FLAG (op, FLAG_UNAGGRESSIVE);	1935	int unaggressive = QUERY_FLAG (op, FLAG_UNAGGRESSIVE);
2022	object *owner = get_owner (op);	1936	object *owner = op->owner;
2023		1937
2024	if (!op->other_arch)	1938	if (!op->other_arch)
2025	{	1939	{
2026	LOG (llevError, "SPLITTING without other_arch error.\n");	1940	LOG (llevError, "SPLITTING without other_arch error.\n");
2027	return maxdam;	1941	return maxdam;
2028	}	1942	}
		1943
2029	remove_ob (op);	1944	op->remove ();
2030	for (i = 0; i < NROFNEWOBJS (op); i++)	1945
		1946	for (i = 0; i < op->stats.food; i++)
2031	{ /* This doesn't handle op->more yet */	1947	{ /* This doesn't handle op->more yet */
2032	object *tmp = arch_to_object (op->other_arch);	1948	object *tmp = arch_to_object (op->other_arch);
2033	int j;	1949	int j;
2034		1950
2035	tmp->stats.hp = op->stats.hp;	1951	tmp->stats.hp = op->stats.hp;
		1952
2036	if (friendly)	1953	if (friendly)
2037	{	1954	{
2038	SET_FLAG (tmp, FLAG_FRIENDLY);
2039	add_friendly_object (tmp);	1955	add_friendly_object (tmp);
2040	tmp->attack_movement = PETMOVE;	1956	tmp->attack_movement = PETMOVE;
		1957
2041	if (owner != NULL)	1958	if (owner)
2042	set_owner (tmp, owner);	1959	tmp->set_owner (owner);
2043	}	1960	}
		1961
2044	if (unaggressive)	1962	if (unaggressive)
2045	SET_FLAG (tmp, FLAG_UNAGGRESSIVE);	1963	SET_FLAG (tmp, FLAG_UNAGGRESSIVE);
		1964
2046	j = find_first_free_spot (tmp, op->map, op->x, op->y);	1965	j = find_first_free_spot (tmp, op->map, op->x, op->y);
		1966
2047	if (j == -1) /* No spot to put this monster */	1967	if (j == -1) /* No spot to put this monster */
2048	free_object (tmp);	1968	tmp->destroy ();
2049	else	1969	else
2050	{	1970	{
2051	tmp->x = op->x + freearr_x[j], tmp->y = op->y + freearr_y[j];	1971	tmp->x = op->x + freearr_x[j], tmp->y = op->y + freearr_y[j];
2052	insert_ob_in_map (tmp, op->map, NULL, 0);	1972	insert_ob_in_map (tmp, op->map, NULL, 0);
2053	}	1973	}
2054	}	1974	}
2055	if (friendly)	1975
2056	remove_friendly_object (op);	1976	op->destroy ();
2057	free_object (op);
2058	}	1977	}
2059	else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10)	1978	else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10)
2060	{	1979	hitter->destroy ();
2061	remove_ob (hitter);	1980
2062	free_object (hitter);
2063	}
2064	return maxdam;	1981	return maxdam;
2065	}	1982	}
2066
2067		1983
2068	void	1984	void
2069	poison_player (object *op, object *hitter, int dam)	1985	poison_player (object *op, object *hitter, int dam)
2070	{	1986	{
2071	archetype *at = find_archetype ("poisoning");	1987	archetype *at = archetype::find ("poisoning");
2072	object *tmp = present_arch_in_ob (at, op);	1988	object *tmp = present_arch_in_ob (at, op);
2073		1989
2074	if (tmp == NULL)	1990	if (tmp == NULL)
2075	{	1991	{
2076	if ((tmp = arch_to_object (at)) == NULL)	1992	if ((tmp = arch_to_object (at)) == NULL)
…		…
2089	if (QUERY_FLAG (hitter, FLAG_ALIVE))	2005	if (QUERY_FLAG (hitter, FLAG_ALIVE))
2090	tmp->stats.dam += hitter->level / 2;	2006	tmp->stats.dam += hitter->level / 2;
2091	else	2007	else
2092	tmp->stats.dam = dam;	2008	tmp->stats.dam = dam;
2093		2009
2094	copy_owner (tmp, hitter); /* so we get credit for poisoning kills */	2010	tmp->set_owner (hitter); /* so we get credit for poisoning kills */
2095	if (hitter->skill && hitter->skill != tmp->skill)	2011	if (hitter->skill && hitter->skill != tmp->skill)
2096	{	2012	{
2097	tmp->skill = hitter->skill;	2013	tmp->skill = hitter->skill;
2098	}	2014	}
2099		2015
…		…
2105	tmp->stats.Con = MAX (-(dam / 4 + 1), -10);	2021	tmp->stats.Con = MAX (-(dam / 4 + 1), -10);
2106	tmp->stats.Str = MAX (-(dam / 3 + 2), -10);	2022	tmp->stats.Str = MAX (-(dam / 3 + 2), -10);
2107	tmp->stats.Dex = MAX (-(dam / 6 + 1), -10);	2023	tmp->stats.Dex = MAX (-(dam / 6 + 1), -10);
2108	tmp->stats.Int = MAX (-dam / 7, -10);	2024	tmp->stats.Int = MAX (-dam / 7, -10);
2109	SET_FLAG (tmp, FLAG_APPLIED);	2025	SET_FLAG (tmp, FLAG_APPLIED);
2110	fix_player (op);	2026	op->update_stats ();
2111	new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill.");	2027	new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill.");
		2028	op->play_sound (tmp->sound);
2112	}	2029	}
		2030
2113	if (hitter->type == PLAYER)	2031	if (hitter->type == PLAYER)
2114	new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name);	2032	new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name);
2115	else if (get_owner (hitter) != NULL && hitter->owner->type == PLAYER)	2033	else if (hitter->owner != NULL && hitter->owner->type == PLAYER)
2116	new_draw_info_format (NDI_UNIQUE, 0, hitter->owner, "Your %s poisons %s.", &hitter->name, &op->name);	2034	new_draw_info_format (NDI_UNIQUE, 0, hitter->owner, "Your %s poisons %s.", &hitter->name, &op->name);
2117	}	2035	}
		2036
2118	tmp->speed_left = 0;	2037	tmp->speed_left = 0;
2119	}	2038	}
2120	else	2039	else
2121	tmp->stats.food++;	2040	tmp->stats.food++;
2122	}	2041	}
2123		2042
2124	void	2043	void
2125	slow_player (object *op, object *hitter, int dam)	2044	slow_player (object *op, object *hitter, int dam)
2126	{	2045	{
2127	archetype *at = find_archetype ("slowness");	2046	archetype *at = archetype::find ("slowness");
2128	object *tmp;	2047	object *tmp;
2129		2048
2130	if (at == NULL)	2049	if (at == NULL)
2131	{
2132	LOG (llevError, "Can't find slowness archetype.\n");	2050	LOG (llevError, "Can't find slowness archetype.\n");
2133	}	2051
2134	if ((tmp = present_arch_in_ob (at, op)) == NULL)	2052	if ((tmp = present_arch_in_ob (at, op)) == NULL)
2135	{	2053	{
2136	tmp = arch_to_object (at);	2054	tmp = arch_to_object (at);
2137	tmp = insert_ob_in_ob (tmp, op);	2055	tmp = insert_ob_in_ob (tmp, op);
2138	new_draw_info (NDI_UNIQUE, 0, op, "The world suddenly moves very fast!");	2056	new_draw_info (NDI_UNIQUE, 0, op, "The world suddenly moves very fast!");
2139	}	2057	}
2140	else	2058	else
2141	tmp->stats.food++;	2059	tmp->stats.food++;
		2060
2142	SET_FLAG (tmp, FLAG_APPLIED);	2061	SET_FLAG (tmp, FLAG_APPLIED);
2143	tmp->speed_left = 0;	2062	tmp->speed_left = 0;
2144	fix_player (op);	2063	op->update_stats ();
2145	}	2064	}
2146		2065
2147	void	2066	void
2148	confuse_player (object *op, object *hitter, int dam)	2067	confuse_player (object *op, object *hitter, int dam)
2149	{	2068	{
…		…
2163	tmp->speed = 0.05;	2082	tmp->speed = 0.05;
2164	tmp->subtype = FORCE_CONFUSION;	2083	tmp->subtype = FORCE_CONFUSION;
2165	tmp->duration = 8 + MAX (1, 5 * (100 - op->resist[ATNR_CONFUSION]) / 100);	2084	tmp->duration = 8 + MAX (1, 5 * (100 - op->resist[ATNR_CONFUSION]) / 100);
2166	tmp->name = "confusion";	2085	tmp->name = "confusion";
2167	maxduration = MAX (2, 30 * (100 - op->resist[ATNR_CONFUSION]) / 100);	2086	maxduration = MAX (2, 30 * (100 - op->resist[ATNR_CONFUSION]) / 100);
		2087
2168	if (tmp->duration > maxduration)	2088	if (tmp->duration > maxduration)
2169	tmp->duration = maxduration;	2089	tmp->duration = maxduration;
2170		2090
2171	if (op->type == PLAYER && !QUERY_FLAG (op, FLAG_CONFUSED))	2091	if (op->type == PLAYER && !QUERY_FLAG (op, FLAG_CONFUSED))
2172	new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very confused!");	2092	new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very confused!");
		2093
2173	SET_FLAG (op, FLAG_CONFUSED);	2094	SET_FLAG (op, FLAG_CONFUSED);
2174	}	2095	}
2175		2096
2176	void	2097	void
2177	blind_player (object *op, object *hitter, int dam)	2098	blind_player (object *op, object *hitter, int dam)
…		…
2193	*/	2114	*/
2194	tmp->speed = tmp->speed * (100.0 - (float) op->resist[ATNR_BLIND]) / 100;	2115	tmp->speed = tmp->speed * (100.0 - (float) op->resist[ATNR_BLIND]) / 100;
2195		2116
2196	tmp = insert_ob_in_ob (tmp, op);	2117	tmp = insert_ob_in_ob (tmp, op);
2197	change_abil (op, tmp); /* Mostly to display any messages */	2118	change_abil (op, tmp); /* Mostly to display any messages */
2198	fix_player (op); /* This takes care of some other stuff */	2119	op->update_stats (); /* This takes care of some other stuff */
2199		2120
2200	if (hitter->owner)	2121	if (hitter->owner)
2201	owner = get_owner (hitter);	2122	owner = hitter->owner;
2202	else	2123	else
2203	owner = hitter;	2124	owner = hitter;
2204		2125
2205	new_draw_info_format (NDI_UNIQUE, 0, owner, "Your attack blinds %s!", query_name (op));	2126	new_draw_info_format (NDI_UNIQUE, 0, owner, "Your attack blinds %s!", query_name (op));
2206	}	2127	}
…		…
2243	op->speed_left = (float) -(FABS (op->speed) * max);	2164	op->speed_left = (float) -(FABS (op->speed) * max);
2244		2165
2245	/* tmp->stats.food = (signed short) (max/FABS(op->speed)); */	2166	/* tmp->stats.food = (signed short) (max/FABS(op->speed)); */
2246	}	2167	}
2247		2168
2248
2249	/* Attempts to kill 'op'. hitter is the attack object, dam is	2169	/* Attempts to kill 'op'. hitter is the attack object, dam is
2250	* the computed damaged.	2170	* the computed damaged.
2251	*/	2171	*/
2252	void	2172	void
2253	deathstrike_player (object *op, object *hitter, int *dam)	2173	deathstrike_player (object *op, object *hitter, int *dam)
…		…
2261	** field of the deathstriking object */	2181	** field of the deathstriking object */
2262		2182
2263	int atk_lev, def_lev, kill_lev;	2183	int atk_lev, def_lev, kill_lev;
2264		2184
2265	if (hitter->slaying)	2185	if (hitter->slaying)
2266	if (!((QUERY_FLAG (op, FLAG_UNDEAD) && strstr (hitter->slaying, undead_name)) || (op->race && strstr (hitter->slaying, op->race))))	2186	if (!((QUERY_FLAG (op, FLAG_UNDEAD) && strstr (hitter->slaying, shstr_undead)) || (op->race && strstr (hitter->slaying, op->race))))
2267	return;	2187	return;
2268		2188
2269	def_lev = op->level;	2189	def_lev = op->level;
2270	if (def_lev < 1)	2190	if (def_lev < 1)
2271	{	2191	{
2272	LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->name, &op->name);	2192	LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->archname, &op->name);
2273	def_lev = 1;	2193	def_lev = 1;
2274	}	2194	}
		2195
2275	atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2;	2196	atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2;
2276	/* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n",	2197	/* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n",
2277	atk_lev, def_lev); */	2198	atk_lev, def_lev); */
2278		2199
2279	if (atk_lev >= def_lev)	2200	if (atk_lev >= def_lev)
…		…
2294	*/	2215	*/
2295	*dam *= kill_lev / def_lev;	2216	*dam *= kill_lev / def_lev;
2296	}	2217	}
2297	}	2218	}
2298	else	2219	else
2299	{
2300	*dam = 0; /* no harm done */	2220	*dam = 0; /* no harm done */
2301	}
2302	}	2221	}
2303		2222
2304	/* thrown_item_effect() - handles any special effects of thrown	2223	/* thrown_item_effect() - handles any special effects of thrown
2305	* items (like attacking living creatures--a potion thrown at a	2224	* items (like attacking living creatures--a potion thrown at a
2306	* monster).	2225	* monster).
…		…
2335	}	2254	}
2336	}	2255	}
2337	}	2256	}
2338		2257
2339	/* adj_attackroll() - adjustments to attacks by various conditions */	2258	/* adj_attackroll() - adjustments to attacks by various conditions */
2340
2341	int	2259	int
2342	adj_attackroll (object *hitter, object *target)	2260	adj_attackroll (object *hitter, object *target)
2343	{	2261	{
2344	object *attacker = hitter;	2262	object *attacker = hitter;
2345	int adjust = 0;	2263	int adjust = 0;
…		…
2352	}	2270	}
2353		2271
2354	/* aimed missiles use the owning object's sight */	2272	/* aimed missiles use the owning object's sight */
2355	if (is_aimed_missile (hitter))	2273	if (is_aimed_missile (hitter))
2356	{	2274	{
2357	if ((attacker = get_owner (hitter)) == NULL)	2275	if ((attacker = hitter->owner) == NULL)
2358	attacker = hitter;	2276	attacker = hitter;
2359	/* A player who saves but hasn't quit still could have objects	2277	/* A player who saves but hasn't quit still could have objects
2360	* owned by him - need to handle that case to avoid crashes.	2278	* owned by him - need to handle that case to avoid crashes.
2361	*/	2279	*/
2362	if (QUERY_FLAG (attacker, FLAG_REMOVED))	2280	if (QUERY_FLAG (attacker, FLAG_REMOVED))
…		…
2410	#endif	2328	#endif
2411		2329
2412	return adjust;	2330	return adjust;
2413	}	2331	}
2414		2332
2415
2416	/* determine if the object is an 'aimed' missile */	2333	/* determine if the object is an 'aimed' missile */
2417	int	2334	int
2418	is_aimed_missile (object *op)	2335	is_aimed_missile (object *op)
2419	{	2336	{
2420		2337
2421	/* I broke what used to be one big if into a few nested	2338	/* I broke what used to be one big if into a few nested
2422	* ones so that figuring out the logic is at least possible.	2339	* ones so that figuring out the logic is at least possible.
2423	*/	2340	*/
2424	if (op && (op->move_type & MOVE_FLYING))	2341	if (op && (op->move_type & MOVE_FLYING))
2425	{
2426	if (op->type == ARROW || op->type == THROWN_OBJ)	2342	if (op->type == ARROW || op->type == THROWN_OBJ)
2427	return 1;	2343	return 1;
2428	else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET || op->subtype == SP_EXPLOSION))	2344	else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET || op->subtype == SP_EXPLOSION))
2429	return 1;	2345	return 1;
2430	}	2346
2431	return 0;	2347	return 0;
2432	}	2348	}

Diff Legend

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