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

Diff Legend

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