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.22 by root, Fri Sep 29 11:53:09 2006 UTC vs.
Revision 1.81 by root, Tue Apr 22 02:46:18 2008 UTC

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

Diff Legend

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