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

Diff Legend

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