ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

Diff Legend

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