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.14 by root, Thu Sep 14 17:10:25 2006 UTC vs.
Revision 1.78 by root, Mon Oct 22 03:11:46 2007 UTC

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

Diff Legend

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