[ViewVC] Diff of: cvs/deliantra/server/server/player.C

Comparing deliantra/server/server/player.C (file contents):
Revision 1.220 by root, Sun Dec 28 16:35:32 2008 UTC vs.
Revision 1.263 by root, Sat Apr 3 22:30:21 2010 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	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 (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* 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,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
		24
		25	//+GPL
23		26
24	#include <global.h>	27	#include <global.h>
25	#include <sproto.h>	28	#include <sproto.h>
26	#include <sounds.h>	29	#include <sounds.h>
27	#include <living.h>	30	#include <living.h>
32	#include <algorithm>	35	#include <algorithm>
33	#include <functional>	36	#include <functional>
34		37
35	playervec players;	38	playervec players;
36		39
37	void
38	display_motd (const object *op)
39	{
40	char buf[MAX_BUF];
41	char motd[HUGE_BUF];
42	FILE *fp;
43	int comp;
44	int size;
45
46	sprintf (buf, "%s/%s", settings.confdir, settings.motd);
47	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
48	return;
49
50	motd[0] = '\0';
51	size = 0;
52
53	while (fgets (buf, MAX_BUF, fp))
54	{
55	if (*buf == '#')
56	continue;
57
58	strncat (motd + size, buf, HUGE_BUF - size);
59	size += strlen (buf);
60	}
61
62	draw_ext_info (NDI_UNIQUE \| NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
63	close_and_delete (fp, comp);
64	}
65
66	void
67	send_rules (const object *op)
68	{
69	char buf[MAX_BUF];
70	char rules[HUGE_BUF];
71	FILE *fp;
72	int comp;
73	int size;
74
75	sprintf (buf, "%s/%s", settings.confdir, settings.rules);
76	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
77	return;
78
79	rules[0] = '\0';
80	size = 0;
81
82	while (fgets (buf, MAX_BUF, fp))
83	{
84	if (*buf == '#')
85	continue;
86
87	if (size + strlen (buf) >= HUGE_BUF)
88	{
89	LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
90	break;
91	}
92
93	strncat (rules + size, buf, HUGE_BUF - size);
94	size += strlen (buf);
95	}
96
97	draw_ext_info (NDI_UNIQUE \| NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
98	close_and_delete (fp, comp);
99	}
100
101	void
102	send_news (const object *op)
103	{
104	char buf[MAX_BUF];
105	char news[HUGE_BUF];
106	char subject[MAX_BUF];
107	FILE *fp;
108	int comp;
109	int size;
110
111	sprintf (buf, "%s/%s", settings.confdir, settings.news);
112	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
113	return;
114
115	news[0] = '\0';
116	subject[0] = '\0';
117	size = 0;
118
119	while (fgets (buf, MAX_BUF, fp))
120	{
121	if (*buf == '#')
122	continue;
123
124	if (*buf == '%')
125	{ /* send one news */
126	if (size > 0)
127	draw_ext_info_format (NDI_UNIQUE \| NDI_GREEN, 0, op,
128	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS,
129	"INFORMATION: %s\n%s", (char *)"%s\n%s",
130	subject, news); /send previously read news /
131
132	strcpy (subject, buf + 1);
133	strip_endline (subject);
134	size = 0;
135	news[0] = '\0';
136	}
137	else
138	{
139	if (size + strlen (buf) >= HUGE_BUF)
140	{
141	LOG (llevDebug, "Warning, one news item has size > %d bytes.\n", HUGE_BUF);
142	break;
143	}
144	strncat (news + size, buf, HUGE_BUF - size);
145	size += strlen (buf);
146	}
147	}
148
149	draw_ext_info_format (NDI_UNIQUE \| NDI_GREEN, 0, op,
150	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
151	close_and_delete (fp, comp);
152	}
153
154	/* This loads the first map an puts the player on it. */	40	/* This loads the first map an puts the player on it. */
155	static void	41	static void
156	set_first_map (object *op)	42	set_first_map (object *op)
157	{	43	{
158	op->contr->maplevel = first_map_path;	44	op->contr->maplevel = first_map_path;
…		…
221	ob->race = ob->arch->race;	107	ob->race = ob->arch->race;
222		108
223	ob->update_weight ();	109	ob->update_weight ();
224	link_skills ();	110	link_skills ();
225		111
226	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
227
228	assign (title, ob->arch->object::name);	112	assign (title, ob->arch->object::name);
229		113
230	/* if it's a dragon player, set the correct title here */	114	/* if it's a dragon player, set the correct title here */
231	if (is_dragon_pl (ob))	115	if (ob->is_dragon ())
232	{	116	{
233	object tmp, abil = 0, *skin = 0;	117	object tmp, abil = 0, *skin = 0;
234		118
235	for (tmp = ob->inv; tmp; tmp = tmp->below)	119	for (tmp = ob->inv; tmp; tmp = tmp->below)
236	if (tmp->type == FORCE)	120	if (tmp->type == FORCE)
…		…
250		134
251	ns->floorbox_update ();	135	ns->floorbox_update ();
252	esrv_send_inventory (ob, ob);	136	esrv_send_inventory (ob, ob);
253	esrv_add_spells (this, 0);	137	esrv_add_spells (this, 0);
254		138
		139	ob->flag [FLAG_READY_WEAPON] = false;
		140	ob->flag [FLAG_READY_SKILL] = false;
		141	ob->flag [FLAG_READY_RANGE] = false;
		142	ob->flag [FLAG_READY_BOW] = false;
		143
		144	for (object *op = ob->inv; op; op = op->below)
		145	if (op->flag [FLAG_APPLIED])
		146	switch (op->type)
		147	{
		148	case SKILL:
		149	op->flag [FLAG_APPLIED] = false;
		150	break;
		151
		152	case SPELL:
		153	case WAND:
		154	case ROD:
		155	case HORN:
		156	case BOW:
		157	case RANGED:
		158	ranged_ob = op;
		159	op->flag [FLAG_APPLIED] = false;
		160	break;
		161
		162	case WEAPON:
		163	combat_ob = op;
		164	op->flag [FLAG_APPLIED] = false;
		165	break;
		166	}
		167
		168	ob->update_stats (); // we unapplied stuff above
		169
		170	ob->current_weapon = 0;
		171	if (object *item = combat_ob ? combat_ob : ranged_ob)
		172	ob->apply (item);
		173
255	activate ();	174	activate ();
256
257	send_rules (ob);
258	send_news (ob);
259	display_motd (ob);
260		175
261	INVOKE_PLAYER (CONNECT, this);	176	INVOKE_PLAYER (CONNECT, this);
262	INVOKE_PLAYER (LOGIN, this);	177	INVOKE_PLAYER (LOGIN, this);
263	}	178	}
264		179
…		…
281	ns->reset_stats ();	196	ns->reset_stats ();
282	ns->pl = 0;	197	ns->pl = 0;
283	ns = 0;	198	ns = 0;
284	}	199	}
285		200
286	observe = ob;	201	// this is important for the player scheduler to get the correct refcount
		202	// when ns = 0
		203	observe = viewpoint = ob;
287		204
288	deactivate ();	205	deactivate ();
289	}	206	}
		207
		208	//-GPL
290		209
291	// the need for this function can be explained	210	// the need for this function can be explained
292	// by load_object not returning the object	211	// by load_object not returning the object
293	void	212	void
294	player::set_object (object *op)	213	player::set_object (object *op)
295	{	214	{
296	ob = observe = op;	215	ob = observe = viewpoint = op;
297	ob->contr = this; /* this aren't yet in archetype */	216	ob->contr = this; /* this aren't yet in archetype */
298		217
299	ob->speed = 1.0f;	218	ob->speed = 1.0f;
300	ob->speed_left = 0.5f;	219	ob->speed_left = 0.5f;
301		220
302	ob->direction = 5; /* So player faces south */	221	ob->direction = 5; /* So player faces south */
303
304	ob->flag [FLAG_READY_WEAPON] = false;
305	ob->flag [FLAG_READY_SKILL] = false;
306	ob->flag [FLAG_READY_BOW] = false;
307
308	for (object *op = ob->inv; op; op = op->below)
309	if (op->flag [FLAG_APPLIED])
310	switch (op->type)
311	{
312	case SKILL:
313	ob->flag [FLAG_APPLIED] = false;
314	break;
315
316	case WAND:
317	case ROD:
318	case HORN:
319	case BOW:
320	ranged_ob = op;
321	break;
322
323	case WEAPON:
324	combat_ob = op;
325	break;
326	}
327
328	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
329	ob->deactivate (); // change_weapon activates, fix this better
330	}	222	}
331		223
332	void	224	void
333	player::set_observe (object *op)	225	player::set_observe (object *op)
334	{	226	{
335	observe = op ? op : ob;	227	observe = viewpoint = op ? op : ob;
336	do_los = 1;	228	do_los = 1;
337	}	229	}
		230
		231	void
		232	player::set_viewpoint (object *op)
		233	{
		234	viewpoint = op ? op : (object *)observe;
		235	do_los = 1;
		236	}
		237
		238	//+GPL
338		239
339	player::player ()	240	player::player ()
340	{	241	{
341	/* There are some elements we want initialised to non zero value -	242	/* There are some elements we want initialised to non zero value -
342	* we deal with that below this point.	243	* we deal with that below this point.
…		…
369	{	270	{
370	ob->destroy_inv (false);	271	ob->destroy_inv (false);
371	ob->destroy ();	272	ob->destroy ();
372	}	273	}
373		274
374	ob = observe = 0;	275	ob = observe = viewpoint = 0;
375	}	276	}
376		277
377	player::~player ()	278	player::~player ()
378	{	279	{
379	/* Clear item stack */	280	/* Clear item stack */
380	free (stack_items);	281	free (stack_items);
		282	}
		283
		284	/*
		285	* get_player_archetype() return next player archetype from archetype
		286	* list. Not very efficient routine, but used only creating new players.
		287	* Note: there MUST be at least one player archetype!
		288	*/
		289	static archetype *
		290	get_player_archetype (archetype *at)
		291	{
		292	// archetypes could have been reloaded
		293	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
		294
		295	if (!nat)
		296	return at;
		297
		298	archvec::iterator i = archetypes.find (nat);
		299
		300	for (;;)
		301	{
		302	if (++i == archetypes.end ())
		303	i = archetypes.begin ();
		304	else if (*i == at)
		305	cleanup ("not a single player archetype found");
		306
		307	if ((*i)->type == PLAYER)
		308	return *i;
		309	}
381	}	310	}
382		311
383	/* Tries to add player on the connection passed in ns.	312	/* Tries to add player on the connection passed in ns.
384	* All we can really get in this is some settings like host and display	313	* All we can really get in this is some settings like host and display
385	* mode.	314	* mode.
…		…
387	player *	316	player *
388	player::create ()	317	player::create ()
389	{	318	{
390	player *pl = new player;	319	player *pl = new player;
391		320
392	pl->set_object (arch_to_object (get_player_archetype (0)));	321	pl->set_object (get_player_archetype (0)->instance ());
393		322
394	pl->ob->roll_stats ();	323	pl->ob->roll_stats ();
395	pl->ob->stats.wc = 2;	324	pl->ob->stats.wc = 2;
396	pl->ob->run_away = 25; /* Then we panick... */	325	pl->ob->run_away = 25; /* Then we panick... */
397		326
398	set_first_map (pl->ob);	327	set_first_map (pl->ob);
399		328
400	return pl;	329	return pl;
401	}
402
403	/*
404	* get_player_archetype() return next player archetype from archetype
405	* list. Not very efficient routine, but used only creating new players.
406	* Note: there MUST be at least one player archetype!
407	*/
408	archetype *
409	get_player_archetype (archetype *at)
410	{
411	// archetypes could have been reloaded
412	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
413
414	if (!nat)
415	return at;
416
417	archvec::iterator i = archetypes.find (nat);
418
419	for (;;)
420	{
421	if (++i == archetypes.end ())
422	i = archetypes.begin ();
423	else if (*i == at)
424	cleanup ("not a single player archetype found");
425
426	if ((*i)->type == PLAYER)
427	return *i;
428	}
429	}	330	}
430		331
431	object *	332	object *
432	get_nearest_player (object *mon)	333	get_nearest_player (object *mon)
433	{	334	{
…		…
673	op->destroy ();	574	op->destroy ();
674	continue;	575	continue;
675	}	576	}
676	}	577	}
677		578
678	/* This really needs to be better - we should really give	579	/* Here we remove duplicated skills (as duplicated spell objects have
679	* a substitute spellbook. The problem is that we don't really	580	* _very_ confusing effects for players), which could for instance be
680	* have a good idea what to replace it with (need something like	581	* generated by bad treasurelists. - elmex
681	* a first level treasurelist for each skill.)
682	* remove duplicate skills also
683	*/	582	*/
684	if (op->type == SPELLBOOK \|\| op->type == SKILL)	583	if (op->type == SKILL)
685	{	584	{
686	object *tmp;
687
688	for (tmp = op->below; tmp; tmp = tmp->below)	585	for (object *tmp = op->below; tmp; tmp = tmp->below)
689	if (tmp->type == op->type && tmp->name == op->name)	586	if (tmp->type == op->type && tmp->name == op->name)
690	break;
691
692	if (tmp)
693	{	587	{
694	op->destroy ();	588	op->destroy ();
		589	LOG (llevError,
695	LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);	590	"give_initial_items: Removing duplicate skill %s\n", &tmp->name);
696	continue;	591	break;
697	}	592	}
698		593
699	if (op->nrof > 1)	594	if (op->nrof > 1)
700	op->nrof = 1;	595	op->nrof = 1;
701	}	596	}
702		597
…		…
748	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");	643	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
749	}	644	}
750		645
751	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */	646	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
752	static int	647	static int
753	roll_stat (void)	648	roll_stat ()
754	{	649	{
755	int a[4], i, j, k;	650	int a[4], i, j, k;
756		651
757	for (i = 0; i < 4; i++)	652	for (i = 0; i < 4; i++)
758	a[i] = (int) rndm (6) + 1;	653	a[i] = (int) rndm (6) + 1;
…		…
855	player::chargen_race_done ()	750	player::chargen_race_done ()
856	{	751	{
857	/* this must before then initial items are given */	752	/* this must before then initial items are given */
858	esrv_new_player (ob->contr);	753	esrv_new_player (ob->contr);
859		754
860	treasurelist *tl = treasurelist::find ("starting_wealth");	755	treasurelist *tl = treasurelist::find (shstr_starting_wealth);
861	if (tl)	756	if (tl)
862	create_treasure (tl, ob, 0, 0, 0);	757	create_treasure (tl, ob, 0, 0, 0);
863		758
864	INVOKE_PLAYER (BIRTH, ob->contr);	759	INVOKE_PLAYER (BIRTH, ob->contr);
865	INVOKE_PLAYER (LOGIN, ob->contr);	760	INVOKE_PLAYER (LOGIN, ob->contr);
…		…
918	ob->stats.hp = ob->stats.maxhp;	813	ob->stats.hp = ob->stats.maxhp;
919	ob->stats.sp = ob->stats.maxsp;	814	ob->stats.sp = ob->stats.maxsp;
920	ob->stats.grace = 0;	815	ob->stats.grace = 0;
921	}	816	}
922		817
923	void	818	static void
924	flee_player (object *op)	819	flee_player (object *op)
925	{	820	{
926	int dir, diff;	821	int dir, diff;
927	rv_vector rv;	822	rv_vector rv;
928		823
…		…
952	dir = absdir (4 + rv.direction);	847	dir = absdir (4 + rv.direction);
953	for (diff = 0; diff < 3; diff++)	848	for (diff = 0; diff < 3; diff++)
954	{	849	{
955	int m = 1 - rndm (2) * 2;	850	int m = 1 - rndm (2) * 2;
956		851
957	if (move_ob (op, absdir (dir + diff * m), op) \|\| (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))	852	if (op->move (absdir (dir + diff * m)) \|\| (diff == 0 && op->move (absdir (dir - diff * m))))
958	return;	853	return;
959	}	854	}
960		855
961	/* Cornered, get rid of scared */	856	/* Cornered, get rid of scared */
962	CLEAR_FLAG (op, FLAG_SCARED);	857	CLEAR_FLAG (op, FLAG_SCARED);
…		…
972	{	867	{
973	object tmp, next;	868	object tmp, next;
974	int stop = 0;	869	int stop = 0;
975	int wvratio;	870	int wvratio;
976		871
977	/* if you're flying, you cna't pick up anything */	872	/* if you're flying, you can't pick up anything */
978	if (op->move_type & MOVE_FLYING)	873	if (op->move_type & MOVE_FLYING)
979	return 1;	874	return 1;
980		875
981	next = op->below;	876	next = op->below;
982		877
983	int cnt = MAX_ITEM_PER_DROP;	878	int cnt = MAX_ITEM_PER_ACTION;
984	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)	879	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
985		880
986	/* loop while there are items on the floor that are not marked as	881	/* loop while there are items on the floor that are not marked as
987	* destroyed */	882	* destroyed */
988	while (next && !next->destroyed ())	883	while (next && !next->destroyed ())
…		…
1014	if (op->contr->mode & PU_DEBUG)	909	if (op->contr->mode & PU_DEBUG)
1015	{	910	{
1016	/* some debugging code to figure out item information */	911	/* some debugging code to figure out item information */
1017	const char *str = tmp->name	912	const char *str = tmp->name
1018	? format ("item name: %s item type: %d weight/value: %d",	913	? format ("item name: %s item type: %d weight/value: %d",
1019	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))))	914	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))))
1020	: format ("item name: %s item type: %d weight/value: %d",	915	: format ("item name: %s item type: %d weight/value: %d",
1021	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	916	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1022		917
1023	new_draw_info (NDI_UNIQUE, 0, op, str);	918	new_draw_info (NDI_UNIQUE, 0, op, str);
1024	}	919	}
1025		920
1026	if (op->contr->mode & PU_INHIBIT)	921	if (op->contr->mode & PU_INHIBIT)
…		…
1113	continue;	1008	continue;
1114	}	1009	}
1115		1010
1116	/* wands/staves/rods/horns */	1011	/* wands/staves/rods/horns */
1117	if (op->contr->mode & PU_MAGIC_DEVICE)	1012	if (op->contr->mode & PU_MAGIC_DEVICE)
1118	if (tmp->type == WAND \|\| tmp->type == ROD \|\| tmp->type == HORN)	1013	if (tmp->type == WAND
		1014	\|\| tmp->type == ROD
		1015	\|\| tmp->type == HORN
		1016	\|\| tmp->type == POWER_CRYSTAL)
1119	{	1017	{
1120	CHK_PICK_PICKUP;	1018	CHK_PICK_PICKUP;
1121	continue;	1019	continue;
1122	}	1020	}
1123		1021
1124	/* pick up all magical items */	1022	/* pick up all magical items */
1125	if (op->contr->mode & PU_MAGICAL)	1023	if (op->contr->mode & PU_MAGICAL)
1126	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1024	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
		1025	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1127	{	1026	{
1128	CHK_PICK_PICKUP;	1027	CHK_PICK_PICKUP;
1129	continue;	1028	continue;
1130	}	1029	}
1131		1030
…		…
1138	}	1037	}
1139	}	1038	}
1140		1039
1141	/* rings & amulets - talismans seems to be typed AMULET */	1040	/* rings & amulets - talismans seems to be typed AMULET */
1142	if (op->contr->mode & PU_JEWELS)	1041	if (op->contr->mode & PU_JEWELS)
1143	if (tmp->type == RING \|\| tmp->type == AMULET)	1042	if (tmp->type == RING
		1043	\|\| tmp->type == AMULET
		1044	\|\| tmp->type == GIRDLE
		1045	\|\| tmp->type == SKILL_TOOL)
1144	{	1046	{
1145	CHK_PICK_PICKUP;	1047	CHK_PICK_PICKUP;
1146	continue;	1048	continue;
1147	}	1049	}
1148		1050
…		…
1197	CHK_PICK_PICKUP;	1099	CHK_PICK_PICKUP;
1198	continue;	1100	continue;
1199	}	1101	}
1200		1102
1201	if (op->contr->mode & PU_GLOVES)	1103	if (op->contr->mode & PU_GLOVES)
1202	if (tmp->type == GLOVES)	1104	if (tmp->type == GLOVES \|\| tmp->type == BRACERS)
1203	{	1105	{
1204	CHK_PICK_PICKUP;	1106	CHK_PICK_PICKUP;
1205	continue;	1107	continue;
1206	}	1108	}
1207		1109
…		…
1221	}	1123	}
1222		1124
1223	/* careful: chairs and tables are weapons! */	1125	/* careful: chairs and tables are weapons! */
1224	if (op->contr->mode & PU_ALLWEAPON)	1126	if (op->contr->mode & PU_ALLWEAPON)
1225	{	1127	{
1226	if (tmp->type == WEAPON && tmp->name != NULL)	1128	if (tmp->type == WEAPON)
1227	{	1129	if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair"))
1228	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1229	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1230	{	1130	{
1231	CHK_PICK_PICKUP;	1131	CHK_PICK_PICKUP;
1232	continue;	1132	continue;
1233	}	1133	}
1234	}
1235
1236	if (tmp->type == WEAPON && tmp->name == NULL)
1237	{
1238	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1239	{
1240	CHK_PICK_PICKUP;
1241	continue;
1242	}
1243	}
1244	}	1134	}
1245		1135
1246	/* misc stuff that's useful */	1136	/* misc stuff that's useful */
1247	if (op->contr->mode & PU_KEY)	1137	if (op->contr->mode & PU_KEY)
1248	if (tmp->type == KEY \|\| tmp->type == SPECIAL_KEY)	1138	if (tmp->type == KEY \|\| tmp->type == SPECIAL_KEY)
…		…
1269	fprintf (stderr, "%s", tmp->name);	1159	fprintf (stderr, "%s", tmp->name);
1270	}	1160	}
1271	else	1161	else
1272	fprintf (stderr, "%s", tmp->arch->archname);	1162	fprintf (stderr, "%s", tmp->arch->archname);
1273	fprintf (stderr, ",%d] = ", tmp->type);	1163	fprintf (stderr, ",%d] = ", tmp->type);
1274	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1164	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1275	#endif	1165	#endif
1276	CHK_PICK_PICKUP;	1166	CHK_PICK_PICKUP;
1277	continue;	1167	continue;
1278	}	1168	}
1279	} /* the new pickup model */	1169	} /* the new pickup model */
1280	}	1170	}
1281		1171
1282	return !stop;	1172	return !stop;
1283	}	1173	}
1284		1174
		1175	/* routine for both players and monsters. We call this when
		1176	* there is a possibility for our action distrubing our hiding
		1177	* place or invisiblity spell. Artefact invisiblity causes
		1178	* "noise" instead. If we arent invisible to begin with, we
		1179	* return 0.
		1180	*/
		1181	static int
		1182	action_makes_visible (object *op)
		1183	{
		1184	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
		1185	{
		1186	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
		1187	{
		1188	// artefact invisibility is permanent, but we still make noise
		1189	// this is important for game-balance.
		1190	if (op->contr)
		1191	op->make_noise ();
		1192
		1193	return 0;
		1194	}
		1195
		1196	if (op->contr && op->contr->tmp_invis == 0)
		1197	return 0;
		1198
		1199	/* If monsters, they should become visible */
		1200	if (op->flag [FLAG_HIDDEN] \|\| !op->contr \|\| (op->contr && op->contr->tmp_invis))
		1201	{
		1202	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
		1203	return 1;
		1204	}
		1205	}
		1206
		1207	return 0;
		1208	}
		1209
1285	/*	1210	/*
1286	* Find an arrow in the inventory and after that	1211	* Find an arrow in the inventory and after that
1287	* in the right type container (quiver). Pointer to the	1212	* in the right type container (quiver). Pointer to the
1288	* found object is returned.	1213	* found object is returned.
1289	*/	1214	*/
1290	object *	1215	static object *
1291	find_arrow (object op, const char type)	1216	find_arrow (object op, const char type)
1292	{	1217	{
1293	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1218	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1294	if (tmp->type == ARROW && !strcmp (&tmp->race, type))	1219	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1295	return splay (tmp);	1220	return splay (tmp);
…		…
1309	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1234	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1310	* against the target. A full test is not performed, simply a basic test	1235	* against the target. A full test is not performed, simply a basic test
1311	* of resistances. The archer is making a quick guess at what he sees down	1236	* of resistances. The archer is making a quick guess at what he sees down
1312	* the hall. Failing that it does it's best to pick the highest plus arrow.	1237	* the hall. Failing that it does it's best to pick the highest plus arrow.
1313	*/	1238	*/
1314	object *	1239	static object *
1315	find_better_arrow (object op, object target, const char type, int better)	1240	find_better_arrow (object op, object target, shstr_cmp type, int *better)
1316	{	1241	{
1317	object tmp = NULL, arrow, *ntmp;	1242	object tmp = NULL, arrow, *ntmp;
1318	int attacknum, attacktype, betterby = 0, i;	1243	int attacknum, attacktype, betterby = 0, i;
1319		1244
1320	if (!type)	1245	if (!type)
…		…
1324	{	1249	{
1325	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1250	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))
1326	{	1251	{
1327	i = 0;	1252	i = 0;
1328	ntmp = find_better_arrow (arrow, target, type, &i);	1253	ntmp = find_better_arrow (arrow, target, type, &i);
		1254
1329	if (i > betterby)	1255	if (i > betterby)
1330	{	1256	{
1331	tmp = ntmp;	1257	tmp = ntmp;
1332	betterby = i;	1258	betterby = i;
1333	}	1259	}
1334	}	1260	}
1335	else if (arrow->type == ARROW && arrow->race == type)	1261	else if (arrow->type == ARROW && arrow->race == type)
1336	{	1262	{
1337	/* allways prefer assasination/slaying */	1263	/* allways prefer assasination/slaying */
1338	if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))	1264	if (target->race && arrow->slaying.contains (target->race))
1339	{	1265	{
1340	if (arrow->attacktype & AT_DEATH)	1266	if (arrow->attacktype & AT_DEATH)
1341	{	1267	{
1342	*better = 100;	1268	*better = 100;
1343	return arrow;	1269	return arrow;
…		…
1358	{	1284	{
1359	tmp = arrow;	1285	tmp = arrow;
1360	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;	1286	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1361	}	1287	}
1362	}	1288	}
		1289
1363	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1290	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1364	{	1291	{
1365	tmp = arrow;	1292	tmp = arrow;
1366	betterby = 2 + arrow->magic + arrow->stats.dam;	1293	betterby = 2 + arrow->magic + arrow->stats.dam;
1367	}	1294	}
		1295
1368	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)	1296	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1369	{	1297	{
1370	tmp = arrow;	1298	tmp = arrow;
1371	betterby = 1 + arrow->magic + arrow->stats.dam;	1299	betterby = 1 + arrow->magic + arrow->stats.dam;
1372	}	1300	}
…		…
1385	* find_better_arrow to find a decent arrow to use.	1313	* find_better_arrow to find a decent arrow to use.
1386	* op = the shooter	1314	* op = the shooter
1387	* type = bow->race	1315	* type = bow->race
1388	* dir = fire direction	1316	* dir = fire direction
1389	*/	1317	*/
1390	object *	1318	static object *
1391	pick_arrow_target (object op, const char type, int dir)	1319	pick_arrow_target (object *op, shstr_cmp type, int dir)
1392	{	1320	{
1393	object *tmp = NULL;	1321	object *tmp = NULL;
1394	maptile *m;	1322	maptile *m;
1395	int i, mflags, found, number;	1323	int i, mflags, found, number;
1396	sint16 x, y;	1324	sint16 x, y;
…		…
1482	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1410	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1483	return 0;	1411	return 0;
1484	}	1412	}
1485		1413
1486	// optimisation: move object to top so we will find it quickly again	1414	// optimisation: move object to top so we will find it quickly again
1487	if (bow->below)	1415	splay (bow);
1488	{
1489	bow->remove ();
1490	op->insert (bow);
1491	}
1492	}	1416	}
1493		1417
1494	if (!bow->race \|\| !bow->skill)	1418	if (!bow->race \|\| !bow->skill)
1495	{	1419	{
1496	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1420	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
…		…
1542	arrow->direction = dir;	1466	arrow->direction = dir;
1543		1467
1544	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */	1468	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1545	arrow->stats.hp = arrow->stats.dam;	1469	arrow->stats.hp = arrow->stats.dam;
1546	arrow->stats.grace = arrow->attacktype;	1470	arrow->stats.grace = arrow->attacktype;
1547		1471	arrow->custom_name = arrow->slaying;
1548	if (arrow->slaying)
1549	arrow->spellarg = strdup (arrow->slaying);
1550		1472
1551	#if 0	1473	#if 0
1552	if (player *pl = op->contr)	1474	if (player *pl = op->contr)
1553	{	1475	{
1554	float speed = pl->weapon_sp;	1476	float speed = pl->weapon_sp;
…		…
1616	* but monsters can't. Putting that code here	1538	* but monsters can't. Putting that code here
1617	* makes the fire_bow code much cleaner.	1539	* makes the fire_bow code much cleaner.
1618	* this function should only be called if 'op' is a player,	1540	* this function should only be called if 'op' is a player,
1619	* hence the function name.	1541	* hence the function name.
1620	*/	1542	*/
1621	int	1543	static int
1622	player_fire_bow (object *op, int dir)	1544	player_fire_bow (object *op, int dir)
1623	{	1545	{
1624	int ret;	1546	int ret;
1625		1547
1626	if (op->contr->bowtype == bow_bestarrow)	1548	if (op->contr->bowtype == bow_bestarrow)
…		…
1654	}	1576	}
1655		1577
1656	/* Fires a misc (wand/rod/horn) object in 'dir'.	1578	/* Fires a misc (wand/rod/horn) object in 'dir'.
1657	* Broken apart from 'fire' to keep it more readable.	1579	* Broken apart from 'fire' to keep it more readable.
1658	*/	1580	*/
1659	void	1581	static void
1660	fire_misc_object (object *op, int dir)	1582	fire_misc_object (object *op, int dir)
1661	{	1583	{
1662	object *item = op->contr->ranged_ob;	1584	object *item = op->contr->ranged_ob;
1663		1585
1664	if (!item)	1586	if (!item)
…		…
1671	{	1593	{
1672	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1594	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1673	return;	1595	return;
1674	}	1596	}
1675		1597
1676	if (!op->change_weapon (item))	1598	if (!op->apply (item))
1677	return;	1599	return;
1678		1600
1679	if (item->type == WAND)	1601	if (item->type == WAND)
1680	{	1602	{
1681	if (item->stats.food <= 0)	1603	if (item->stats.food <= 0)
…		…
1686	return;	1608	return;
1687	}	1609	}
1688	}	1610	}
1689	else if (item->type == ROD \|\| item->type == HORN)	1611	else if (item->type == ROD \|\| item->type == HORN)
1690	{	1612	{
1691	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);	1613	sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace);
1692		1614
1693	// using the maximum of the rods charge allows at least one spell cast	1615	// using the maximum of the rods charge allows at least one spell cast
1694	// for a rod or horn, this fixes some broken rods.	1616	// for a rod or horn, this fixes some broken rods.
1695	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))	1617	if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1696	{	1618	{
1697	op->contr->play_sound (sound_find ("wand_poof"));	1619	op->contr->play_sound (sound_find ("wand_poof"));
1698		1620
1699	if (item->type == ROD)	1621	if (item->type == ROD)
1700	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1622	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
…		…
1732	}	1654	}
1733		1655
1734	/* Received a fire command for the player - go and do it.	1656	/* Received a fire command for the player - go and do it.
1735	*/	1657	*/
1736	bool	1658	bool
1737	fire (object *op, int dir)	1659	fire (object *who, int dir)
1738	{	1660	{
1739	int spellcost = 0;	1661	int spellcost = 0;
1740		1662
1741	player *pl = op->contr;	1663	player *pl = who->contr;
1742		1664
1743	if (pl->golem)	1665	if (pl->golem)
1744	{	1666	{
1745	control_golem (op->contr->golem, dir);	1667	control_golem (who->contr->golem, dir);
1746	return false;	1668	return false;
1747	}	1669	}
1748		1670
1749	object *ob = pl->ranged_ob;	1671	object *ob = pl->ranged_ob;
1750		1672
1751	if (!ob)	1673	if (!ob)
1752	return false;	1674	return false;
1753		1675
1754	if (op->speed_left > 0.f)	1676	if (who->speed_left > 0.f)
1755	--op->speed_left;	1677	--who->speed_left;
1756	else	1678	else
1757	return false;	1679	return false;
1758		1680
1759	if (!op->change_weapon (ob))	1681	if (!who->apply (ob))
1760	return false;	1682	return false;
1761		1683
1762	/* check for loss of invisiblity/hide */	1684	/* check for loss of invisiblity/hide */
1763	if (action_makes_visible (op))	1685	if (action_makes_visible (who))
1764	make_visible (op);	1686	make_visible (who);
1765		1687
1766	switch (ob->type)	1688	switch (ob->type)
1767	{	1689	{
1768	case BOW:	1690	case BOW:
1769	player_fire_bow (op, dir);	1691	player_fire_bow (who, dir);
1770	break;	1692	break;
1771		1693
1772	case SPELL:	1694	case SPELL:
1773	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);	1695	spellcost = cast_spell (who, who, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1774	break;	1696	break;
1775		1697
1776	case BUILDER:	1698	case BUILDER:
1777	apply_map_builder (op, dir);	1699	apply_map_builder (who, dir);
1778	break;	1700	break;
1779		1701
1780	case SKILL:	1702	case SKILL:
1781	do_skill (op, op, ob, dir, 0);	1703	do_skill (who, who, ob, dir, 0);
1782	break;	1704	break;
1783		1705
		1706	case RANGED:
		1707	do_skill (who, ob, who->chosen_skill, dir, 0);
		1708	break;
		1709
1784	default:	1710	default:
1785	fire_misc_object (op, dir);	1711	fire_misc_object (who, dir);
1786	break;	1712	break;
1787	}	1713	}
1788		1714
1789	return true;	1715	return true;
1790	}	1716	}
1791		1717
1792	/* find_key	1718	static object *
1793	* We try to find a key for the door as passed. If we find a key
1794	* and successfully use it, we return the key, otherwise NULL
1795	* This function merges both normal and locked door, since the logic
1796	* for both is the same - just the specific key is different.
1797	* pl is the player,
1798	* inv is the objects inventory to searched
1799	* door is the door we are trying to match against.
1800	* This function can be called recursively to search containers.
1801	*/
1802	object *
1803	find_key (object pl, object container, object *door)	1719	find_key_ (object pl, object container, object *door)
1804	{	1720	{
1805	object tmp, key;	1721	object tmp, key;
1806		1722
1807	/* Should not happen, but sanity checking is never bad */	1723	/* Should not happen, but sanity checking is never bad */
1808	if (!container->inv)	1724	if (!container->inv)
…		…
1811	/* First, lets try to find a key in the top level inventory */	1727	/* First, lets try to find a key in the top level inventory */
1812	for (tmp = container->inv; tmp; tmp = tmp->below)	1728	for (tmp = container->inv; tmp; tmp = tmp->below)
1813	{	1729	{
1814	if (door->type == DOOR && tmp->type == KEY)	1730	if (door->type == DOOR && tmp->type == KEY)
1815	break;	1731	break;
		1732
1816	/* For sanity, we should really check door type, but other stuff	1733	/* For sanity, we should really check door type, but other stuff
1817	* (like containers) can be locked with special keys	1734	* (like containers) can be locked with special keys
1818	*/	1735	*/
1819	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1736	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1820	break;	1737	break;
…		…
1826	* a key, return	1743	* a key, return
1827	*/	1744	*/
1828	if (!tmp)	1745	if (!tmp)
1829	{	1746	{
1830	for (tmp = container->inv; tmp; tmp = tmp->below)	1747	for (tmp = container->inv; tmp; tmp = tmp->below)
1831	{
1832	/* No reason to search empty containers */	1748	/* No reason to search empty containers */
1833	if (tmp->type == CONTAINER && tmp->inv)	1749	if (tmp->type == CONTAINER && tmp->inv)
1834	{
1835	if ((key = find_key (pl, tmp, door)))	1750	if ((key = find_key_ (pl, tmp, door)))
1836	return key;	1751	return key;
1837	}
1838	}
1839		1752
1840	if (!tmp)	1753	if (!tmp)
1841	return NULL;	1754	return 0;
1842	}	1755	}
1843		1756
1844	/* We get down here if we have found a key. Now if its in a container,	1757	/* We get down here if we have found a key. Now if its in a container,
1845	* see if we actually want to use it	1758	* see if we actually want to use it
1846	*/	1759	*/
1847	if (pl != container)	1760	if (pl != container)
1848	{	1761	{
1849	/* Only let players use keys in containers */	1762	/* Only let players use keys in containers */
1850	if (!pl->contr)	1763	if (!pl->contr)
1851	return NULL;	1764	return 0;
		1765
1852	/* cases where this fails:	1766	/* cases where this fails:
1853	* If we only search the player inventory, return now since we	1767	* If we only search the player inventory, return now since we
1854	* are not in the players inventory.	1768	* are not in the players inventory.
1855	* If the container is not active, return now since only active	1769	* If the container is not active, return now since only active
1856	* containers can be used.	1770	* containers can be used.
…		…
1860	* inv must have been an container and must have been active.	1774	* inv must have been an container and must have been active.
1861	*	1775	*
1862	* Change the color so that the message doesn't disappear with	1776	* Change the color so that the message doesn't disappear with
1863	* all the others.	1777	* all the others.
1864	*/	1778	*/
1865	if (pl->contr->usekeys == key_inventory \|\|	1779	if (pl->contr->usekeys == key_inventory
1866	!QUERY_FLAG (container, FLAG_APPLIED) \|\|	1780	\|\| !QUERY_FLAG (container, FLAG_APPLIED)
1867	(pl->contr->usekeys == keyrings && (!container->race \|\| strcmp (container->race, "keys"))))	1781	\|\| (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1868	{	1782	{
1869	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,	1783	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,
1870	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1784	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1871	return NULL;	1785	return NULL;
1872	}	1786	}
1873	}	1787	}
1874		1788
1875	return tmp;	1789	return tmp;
		1790	}
		1791
		1792	/* find_key
		1793	* We try to find a key for the door as passed. If we find a key
		1794	* and successfully use it, we return the key, otherwise NULL
		1795	* This function merges both normal and locked door, since the logic
		1796	* for both is the same - just the specific key is different.
		1797	* pl is the player,
		1798	* inv is the objects inventory to searched
		1799	* door is the door we are trying to match against.
		1800	* This function can be called recursively to search containers.
		1801	*/
		1802	object *
		1803	find_key (object pl, object container, object *door)
		1804	{
		1805	if (door->slaying && is_match_expr (door->slaying))
		1806	{
		1807	// for match expressions, we try to find the key by applying the match
		1808	// to the op itself, which is supposed to find the "key", instead
		1809	// of searching through containers ourselves.
		1810
		1811	return match_one (door->slaying, container, door, pl, pl);
		1812	}
		1813	else
		1814	return find_key_ (pl, container, door);
1876	}	1815	}
1877		1816
1878	/* moved door processing out of move_player_attack.	1817	/* moved door processing out of move_player_attack.
1879	* returns 1 if player has opened the door with a key	1818	* returns 1 if player has opened the door with a key
1880	* such that the caller should not do anything more,	1819	* such that the caller should not do anything more,
…		…
1930	* going to try and move (not fire weapons).	1869	* going to try and move (not fire weapons).
1931	*/	1870	*/
1932	bool	1871	bool
1933	move_player_attack (object *op, int dir)	1872	move_player_attack (object *op, int dir)
1934	{	1873	{
1935	int on_battleground;	1874	if (!op->contr->braced && op->speed_left > 0.f && op->move (dir))
		1875	{
		1876	--op->speed_left;
		1877	return true;
		1878	}
1936		1879
1937	sint16 nx = freearr_x[dir] + op->x;	1880	sint16 nx = freearr_x[dir] + op->x;
1938	sint16 ny = freearr_y[dir] + op->y;	1881	sint16 ny = freearr_y[dir] + op->y;
1939		1882
1940	on_battleground = op_on_battleground (op, 0, 0);
1941
1942	if (out_of_map (op->map, nx, ny))	1883	if (out_of_map (op->map, nx, ny))
1943	return false;	1884	return false;
1944
1945	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
1946	{
1947	--op->speed_left;
1948	return true;
1949	}
1950		1885
1951	/* If braced, or can't move to the square, and it is not out of the	1886	/* If braced, or can't move to the square, and it is not out of the
1952	* map, attack it. Note order of if statement is important - don't	1887	* map, attack it. Note order of if statement is important - don't
1953	* want to be calling move_ob if braced, because move_ob will move the	1888	* want to be calling move_ob if braced, because move_ob will move the
1954	* player. This is a pretty nasty hack, because if we could	1889	* player. This is a pretty nasty hack, because if we could
…		…
2023	}	1958	}
2024	else	1959	else
2025	return false;	1960	return false;
2026	}	1961	}
2027		1962
		1963	bool on_battleground = op_on_battleground (op, 0, 0);
		1964
2028	/* in certain circumstances, you shouldn't attack friendly	1965	/* in certain circumstances, you shouldn't attack friendly
2029	* creatures. Note that if you are braced, you can't push	1966	* creatures. Note that if you are braced, you can't push
2030	* someone, but put it inside this loop so that you won't	1967	* someone, but put it inside this loop so that you won't
2031	* attack them either.	1968	* attack them either.
2032	*/	1969	*/
…		…
2096	}	2033	}
2097		2034
2098	bool	2035	bool
2099	move_player (object *op, int dir)	2036	move_player (object *op, int dir)
2100	{	2037	{
2101	int pick;
2102
2103	if (!op->map \|\| op->map->in_memory != MAP_ACTIVE)	2038	if (!op->map \|\| op->map->in_memory != MAP_ACTIVE)
2104	return 0;	2039	return 0;
2105		2040
2106	/* Sanity check: make sure dir is valid */	2041	/* Sanity check: make sure dir is valid */
2107	if ((dir < 0) \|\| (dir >= 9))	2042	if (dir < 0 \|\| dir >= 9)
2108	{	2043	{
2109	LOG (llevError, "move_player: invalid direction %d\n", dir);	2044	LOG (llevError, "move_player: invalid direction %d\n", dir);
2110	return 0;	2045	return 0;
2111	}	2046	}
2112		2047
…		…
2118		2053
2119	if (op->flag [FLAG_HIDDEN])	2054	if (op->flag [FLAG_HIDDEN])
2120	do_hidden_move (op);	2055	do_hidden_move (op);
2121		2056
2122	bool retval;	2057	bool retval;
		2058	int pick = 0;
2123		2059
2124	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2060	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2125	retval = RESULT_INT (0);	2061	retval = RESULT_INT (0);
2126	else if (op->contr->fire_on)	2062	else if (op->contr->fire_on)
2127	retval = fire (op, dir);	2063	retval = fire (op, dir);
…		…
2184	return move_player (op, op->direction);	2120	return move_player (op, op->direction);
2185		2121
2186	return false;	2122	return false;
2187	}	2123	}
2188		2124
2189	int	2125	static int
2190	save_life (object *op)	2126	save_life (object *op)
2191	{	2127	{
2192	if (!QUERY_FLAG (op, FLAG_LIFESAVE))	2128	if (!QUERY_FLAG (op, FLAG_LIFESAVE))
2193	return 0;	2129	return 0;
2194		2130
…		…
2203		2139
2204	if (op->stats.hp < 0)	2140	if (op->stats.hp < 0)
2205	op->stats.hp = op->stats.maxhp;	2141	op->stats.hp = op->stats.maxhp;
2206		2142
2207	if (op->stats.food < 0)	2143	if (op->stats.food < 0)
2208	op->stats.food = 999;	2144	op->stats.food = MAX_FOOD;
2209		2145
2210	op->update_stats ();	2146	op->update_stats ();
2211	return 1;	2147	return 1;
2212	}	2148	}
2213		2149
…		…
2241	void	2177	void
2242	object::drop_unpaid_items ()	2178	object::drop_unpaid_items ()
2243	{	2179	{
2244	if (!flag [FLAG_REMOVED])	2180	if (!flag [FLAG_REMOVED])
2245	::drop_unpaid_items (inv, this);	2181	::drop_unpaid_items (inv, this);
2246	}
2247
2248	/*
2249	* Returns pointer a static string containing gravestone text
2250	* Moved from apply.c to player.c - player.c is what
2251	* actually uses this function. player.c may not be quite the
2252	* best, a misc file for object actions is probably better,
2253	* but there isn't one in the server directory.
2254	*/
2255	const char *
2256	gravestone_text (object *op)
2257	{
2258	static dynbuf_text buf;
2259
2260	buf << "---- R.I.P. ----\n\n"
2261	<< op->name;
2262
2263	if (op->type == PLAYER)
2264	buf << " the " << op->contr->title;
2265
2266	buf << "\n\n";
2267
2268	buf << "who was level ";
2269	buf << (sint32)op->level << "\n\n" // OO breakdown
2270	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
2271
2272	if (op->type == PLAYER)
2273	buf << "by " << op->contr->killer_name () << ".\n\n";
2274
2275	{
2276	static char buf2[128];
2277	time_t now = time (NULL);
2278	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2279	buf << buf2;
2280	}
2281
2282	return buf;
2283	}	2182	}
2284		2183
2285	void	2184	void
2286	do_some_living (object *op)	2185	do_some_living (object *op)
2287	{	2186	{
…		…
2479		2378
2480	if (tmp->type == FOOD \|\| tmp->type == DRINK \|\| tmp->type == POISON)	2379	if (tmp->type == FOOD \|\| tmp->type == DRINK \|\| tmp->type == POISON)
2481	{	2380	{
2482	op->statusmsg ("You blindly grab for a bite of food. "	2381	op->statusmsg ("You blindly grab for a bite of food. "
2483	"H<To prevent you from starving, you ate some random item from your backpack.>");	2382	"H<To prevent you from starving, you ate some random item from your backpack.>");
2484	manual_apply (op, tmp, 0);	2383	op->apply (tmp);
2485		2384
2486	if (op->stats.food >= 0 \|\| op->stats.hp < 0)	2385	if (op->stats.food >= 0 \|\| op->stats.hp < 0)
2487	break;	2386	break;
2488	}	2387	}
2489	else if (tmp->type == FLESH)	2388	else if (tmp->type == FLESH)
…		…
2495	*/	2394	*/
2496	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2395	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2497	{	2396	{
2498	op->statusmsg ("You blindly grab for a bite of food. "	2397	op->statusmsg ("You blindly grab for a bite of food. "
2499	"H<To prevent you from starving, you ate some random item from your backpack.>");	2398	"H<To prevent you from starving, you ate some random item from your backpack.>");
2500	manual_apply (op, flesh, 0);	2399	op->apply (flesh);
2501	}	2400	}
2502		2401
2503	// If player is still starving, alert him!	2402	// If player is still starving, alert him!
2504	if (op->stats.food < 0)	2403	if (op->stats.food < 0)
2505	op->failmsg ("You are starving! "	2404	op->failmsg ("You are starving! "
…		…
2531	*/	2430	*/
2532	void	2431	void
2533	kill_player (object *op)	2432	kill_player (object *op)
2534	{	2433	{
2535	int x, y;	2434	int x, y;
2536	char buf[MAX_BUF];
2537	maptile map; / this is for resurrection */	2435	maptile map; / this is for resurrection */
2538	int will_kill_again;	2436	int will_kill_again;
2539	archetype *at;	2437	archetype *at;
2540	object *tmp;	2438	object *tmp;
2541		2439
2542	if (save_life (op))	2440	if (save_life (op))
2543	return;	2441	return;
		2442
		2443	dynbuf_text deathtab;
		2444
		2445	/* restore player */
		2446	at = archetype::find (shstr_poisoning);
		2447	if (object *tmp = present_arch_in_ob (at, op))
		2448	{
		2449	tmp->destroy ();
		2450	deathtab << "Your body feels cleansed...\r";
		2451	}
		2452
		2453	at = archetype::find (shstr_confusion);
		2454	if (object *tmp = present_arch_in_ob (at, op))
		2455	{
		2456	tmp->destroy ();
		2457	deathtab << "Your mind feels clearer...\r";
		2458	}
		2459
		2460	cure_disease (op, 0, 0); /* remove any disease */
		2461
		2462	max_it (op->stats.hp , op->stats.maxhp);
		2463	max_it (op->stats.sp , op->stats.maxsp);
		2464	max_it (op->stats.grace, op->stats.maxgrace);
		2465	max_it (op->stats.food , 200);
		2466
		2467	// remove all spell effects that are active
		2468	// to avoid long-term effects such as word-of-recall
		2469	for (object *item = op->inv; item; )
		2470	{
		2471	object *next = item->below;
		2472
		2473	if (item->type == SPELL_EFFECT && item->active)
		2474	item->destroy ();
		2475
		2476	item = next;
		2477	}
2544		2478
2545	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2479	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2546	* in cities ONLY!!! It is very important that this doesn't get abused.	2480	* in cities ONLY!!! It is very important that this doesn't get abused.
2547	* Look at op_on_battleground() for more info --AndreasV	2481	* Look at op_on_battleground() for more info --AndreasV
2548	*/	2482	*/
2549	if (op_on_battleground (op, &x, &y))	2483	if (op_on_battleground (op, &x, &y))
2550	{	2484	{
2551	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, "You have been defeated in combat!");	2485	deathtab << "You almost died in combat, but local medics have saved your life...\r";
2552	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, "Local medics have saved your life...");
2553
2554	/* restore player */
2555	at = archetype::find ("poisoning");
2556	if (object *tmp = present_arch_in_ob (at, op))
2557	{
2558	tmp->destroy ();
2559	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2560	}
2561
2562	at = archetype::find ("confusion");
2563	if (object *tmp = present_arch_in_ob (at, op))
2564	{
2565	tmp->destroy ();
2566	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2567	}
2568
2569	cure_disease (op, 0, 0); /* remove any disease */
2570	op->stats.hp = op->stats.maxhp;
2571	if (op->stats.food <= 0)
2572	op->stats.food = 999;
2573		2486
2574	/* create a bodypart-trophy to make the winner happy */	2487	/* create a bodypart-trophy to make the winner happy */
2575	if (object *tmp = arch_to_object (archetype::find ("finger")))	2488	object *tmp = archetype::find (shstr_finger)->instance ();
2576	{	2489
2577	tmp->name = format ("%s's finger" , &op->name);	2490	tmp->name = format ("%s's finger" , &op->name);
2578	tmp->name_pl = format ("%s's fingers", &op->name);	2491	tmp->name_pl = format ("%s's fingers", &op->name);
2579	tmp->msg = format (	2492	tmp->msg = format (
2580	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",	2493	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2581	&op->name, op->contr->title,	2494	&op->name, op->contr->title,
2582	(int)op->level,	2495	(int)op->level,
2583	op->contr->killer_name ()	2496	op->contr->killer_name ()
2584	);	2497	);
2585	tmp->value = 0, tmp->type = 0;	2498	tmp->value = 0, tmp->type = 0;
2586	tmp->materialname = "organics";	2499	tmp->material = name_to_material (shstr_organic);
2587	tmp->insert_at (op, tmp);	2500	tmp->insert_at (op, tmp);
2588	}
2589		2501
2590	/* teleport defeated player to new destination */	2502	/* teleport defeated player to new destination */
2591	transfer_ob (op, x, y, 0, NULL);	2503	transfer_ob (op, x, y, 0, NULL);
2592	op->contr->braced = 0;	2504	op->contr->braced = 0;
		2505
		2506	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2593	return;	2507	return;
2594	}	2508	}
		2509
		2510	deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
		2511	deathtab << "T<YOU HAVE DIED>\n\n";
2595		2512
2596	INVOKE_PLAYER (DEATH, op->contr);	2513	INVOKE_PLAYER (DEATH, op->contr);
2597		2514
2598	command_kill_pets (op, 0);	2515	command_kill_pets (op, 0);
2599		2516
…		…
2650	lost_a_stat = 1;	2567	lost_a_stat = 1;
2651	}	2568	}
2652	else	2569	else
2653	{	2570	{
2654	/* deplete a stat */	2571	/* deplete a stat */
2655	archetype *deparch = archetype::find ("depletion");	2572	archetype *deparch = archetype::find (shstr_depletion);
2656	object *dep;	2573	object *dep;
2657		2574
2658	dep = present_arch_in_ob (deparch, op);	2575	dep = present_arch_in_ob (deparch, op);
2659	if (!dep)	2576	if (!dep)
2660	{	2577	{
2661	dep = arch_to_object (deparch);	2578	dep = deparch->instance ();
2662	insert_ob_in_ob (dep, op);	2579	insert_ob_in_ob (dep, op);
2663	}	2580	}
2664	lose_this_stat = 1;	2581	lose_this_stat = 1;
2665	if (settings.balanced_stat_loss)	2582	if (settings.balanced_stat_loss)
2666	{	2583	{
…		…
2694	}	2611	}
2695	}	2612	}
2696		2613
2697	if (lose_this_stat)	2614	if (lose_this_stat)
2698	{	2615	{
2699	this_stat = get_attr_value (&(dep->stats), i);	2616	this_stat = get_attr_value (&dep->stats, i);
2700	/* We could try to do something clever like find another	2617	/* We could try to do something clever like find another
2701	* stat to reduce if this fails. But chances are, if	2618	* stat to reduce if this fails. But chances are, if
2702	* stats have been depleted to -50, all are pretty low	2619	* stats have been depleted to -50, all are pretty low
2703	* and should be roughly the same, so it shouldn't make a	2620	* and should be roughly the same, so it shouldn't make a
2704	* difference.	2621	* difference.
…		…
2718	/* If no stat lost, tell the player. */	2635	/* If no stat lost, tell the player. */
2719	if (!lost_a_stat)	2636	if (!lost_a_stat)
2720	{	2637	{
2721	/* determine_god() seems to not work sometimes... why is this?	2638	/* determine_god() seems to not work sometimes... why is this?
2722	Should I be using something else? GD */	2639	Should I be using something else? GD */
2723	const char *god = determine_god (op);	2640	shstr_tmp god = determine_god (op);
2724		2641
2725	if (god && (strcmp (god, "none")))	2642	if (god != shstr_none)
2726	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);	2643	deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r";
2727	else	2644	else
2728	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2645	deathtab << "For a brief moment you feel a holy presence protecting you.\r";
2729	}	2646	}
2730	#else	2647	#else
2731	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");	2648	deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely.";
2732	#endif	2649	#endif
2733		2650
2734	/* Put a gravestone up where the character 'almost' died. List the	2651	/* Put a gravestone up where the character 'almost' died. List the
2735	* exp loss on the stone.	2652	* exp loss on the stone.
2736	*/	2653	*/
2737	tmp = arch_to_object (archetype::find ("gravestone"));	2654	tmp = archetype::find (shstr_gravestone)->instance ();
2738	tmp->name = format ("%s's gravestone", &op->name);	2655	tmp->name = format ("%s's gravestone", &op->name);
2739	tmp->name_pl = format ("%s's gravestones", &op->name);	2656	tmp->name_pl = format ("%s's gravestones", &op->name);
2740	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",	2657	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2741	&op->name, op->contr->title, op->contr->killer_name ());	2658	&op->name, op->contr->title, op->contr->killer_name ());
2742	tmp->x = op->x, tmp->y = op->y;	2659	tmp->x = op->x, tmp->y = op->y;
2743	insert_ob_in_map (tmp, op->map, NULL, 0);	2660	insert_ob_in_map (tmp, op->map, NULL, 0);
2744		2661
2745	/**************************************/	2662	/**************************************/
2746	/* */	2663	/* */
2747	/* Subtract the experience points, */	2664	/* Subtract the experience points, */
2748	/* if we died cause of food, give us */
2749	/* food, and reset HP's... */
2750	/* */	2665	/* */
2751	/**************************************/	2666	/**************************************/
2752		2667
2753	/* remove any poisoning and confusion the character may be suffering. */
2754	/* restore player */
2755	at = archetype::find ("poisoning");
2756	tmp = present_arch_in_ob (at, op);
2757
2758	if (tmp)
2759	{
2760	tmp->destroy ();
2761	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2762	}
2763
2764	at = archetype::find ("confusion");
2765	tmp = present_arch_in_ob (at, op);
2766	if (tmp)
2767	{
2768	tmp->destroy ();
2769	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2770	}
2771
2772	cure_disease (op, 0, 0); /* remove any disease */
2773
2774	// remove all spell effects that are active
2775	// to avoid long-term effects such as word-of-recall
2776	for (object *item = op->inv; item; )
2777	{
2778	object *next = item->below;
2779
2780	if (item->type == SPELL_EFFECT && item->active)
2781	item->destroy ();
2782
2783	item = next;
2784	}
2785
2786	/add_exp(op, (op->stats.exp -0.20)); */	2668	/add_exp(op, (op->stats.exp -0.20)); */
2787	apply_death_exp_penalty (op);	2669	apply_death_exp_penalty (op);
2788
2789	if (op->stats.food < 100)
2790	op->stats.food = 900;
2791
2792	op->stats.hp = op->stats.maxhp;
2793	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2794	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2795		2670
2796	/*	2671	/*
2797	* Check to see if the player has any unpaid items. If so, remove them	2672	* Check to see if the player has any unpaid items. If so, remove them
2798	* and put them back in the map.	2673	* and put them back in the map.
2799	*/	2674	*/
…		…
2836		2711
2837	insert_ob_in_ob (force, op);	2712	insert_ob_in_ob (force, op);
2838	op->update_stats ();	2713	op->update_stats ();
2839	}	2714	}
2840		2715
2841	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	2716	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2842	}	2717	}
2843		2718
2844	void	2719	static void
2845	loot_object (object *op)	2720	loot_object (object *op)
2846	{ /* Grab and destroy some treasure */	2721	{ /* Grab and destroy some treasure */
2847	object tmp, tmp2, *next;	2722	object tmp, tmp2, *next;
2848		2723
2849	op->close_container (); /* close open sack first */	2724	op->close_container (); /* close open sack first */
…		…
2880	* fix_weight(): Check recursively the weight of all players, and fix	2755	* fix_weight(): Check recursively the weight of all players, and fix
2881	* what needs to be fixed. Refresh windows and fix speed if anything	2756	* what needs to be fixed. Refresh windows and fix speed if anything
2882	* was changed.	2757	* was changed.
2883	*/	2758	*/
2884	void	2759	void
2885	fix_weight (void)	2760	fix_weight ()
2886	{	2761	{
2887	for_all_players (pl)	2762	for_all_players (pl)
2888	{	2763	{
2889	sint32 old = pl->ob->carrying;	2764	sint32 old = pl->ob->carrying;
2890		2765
…		…
2897	}	2772	}
2898	}	2773	}
2899	}	2774	}
2900		2775
2901	void	2776	void
2902	fix_luck (void)	2777	fix_luck ()
2903	{	2778	{
2904	for_all_players (pl)	2779	for_all_players (pl)
2905	if (!pl->ob->contr->ns->state)	2780	if (!pl->ob->contr->ns->state)
2906	pl->ob->change_luck (0);	2781	pl->ob->change_luck (0);
2907	}	2782	}
…		…
2984	level = ob->map->darklevel () - 2;	2859	level = ob->map->darklevel () - 2;
2985		2860
2986	/* this also picks up whether the object is glowing.	2861	/* this also picks up whether the object is glowing.
2987	* If you carry a light on a non-dark map, its not	2862	* If you carry a light on a non-dark map, its not
2988	* as bad as carrying a light on a pitch dark map */	2863	* as bad as carrying a light on a pitch dark map */
2989	if (has_carried_lights (ob))	2864	if (ob->has_carried_lights ())
2990	level = -(10 + (2 * ob->map->darklevel ()));	2865	level = -(10 + (2 * ob->map->darklevel ()));
2991		2866
2992	/* scan through all nearby squares for terrain to hide in */	2867	/* scan through all nearby squares for terrain to hide in */
2993	for (i = 0, x = ob->x, y = ob->y;	2868	for (i = 0, x = ob->x, y = ob->y;
2994	i <= SIZEOFFREE1;	2869	i <= SIZEOFFREE1;
…		…
3151	}	3026	}
3152		3027
3153	return 0;	3028	return 0;
3154	}	3029	}
3155		3030
3156	/* routine for both players and monsters. We call this when
3157	* there is a possibility for our action distrubing our hiding
3158	* place or invisiblity spell. Artefact invisiblity causes
3159	* "noise" instead. If we arent invisible to begin with, we
3160	* return 0.
3161	*/
3162	int
3163	action_makes_visible (object *op)
3164	{
3165	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3166	{
3167	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3168	{
3169	// artefact invisibility is permanent, but we still make noise
3170	// this is important for game-balance.
3171	if (op->contr)
3172	op->make_noise ();
3173
3174	return 0;
3175	}
3176
3177	if (op->contr && op->contr->tmp_invis == 0)
3178	return 0;
3179
3180	/* If monsters, they should become visible */
3181	if (op->flag [FLAG_HIDDEN] \|\| !op->contr \|\| (op->contr && op->contr->tmp_invis))
3182	{
3183	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3184	return 1;
3185	}
3186	}
3187
3188	return 0;
3189	}
3190
3191	/* op_on_battleground - checks if the given object op (usually	3031	/* op_on_battleground - checks if the given object op (usually
3192	* a player) is standing on a valid battleground-tile,	3032	* a player) is standing on a valid battleground-tile,
3193	* function returns TRUE/FALSE. If true x, y returns the battleground	3033	* function returns TRUE/FALSE. If true x, y returns the battleground
3194	* -exit-coord. (and if x, y not NULL)	3034	* -exit-coord. (and if x, y not NULL)
3195	* 19 March 2005 - josh@woosworld.net modifed to check if the battleground also has slaying, maxhp, and maxsp set	3035	* 19 March 2005 - josh@woosworld.net modifed to check if the battleground also has slaying, maxhp, and maxsp set
…		…
3214	&& tmp->name == shstr_battleground	3054	&& tmp->name == shstr_battleground
3215	&& EXIT_X (tmp) && EXIT_Y (tmp))	3055	&& EXIT_X (tmp) && EXIT_Y (tmp))
3216	{	3056	{
3217	/* before we assign the exit, check if this is a teambattle */	3057	/* before we assign the exit, check if this is a teambattle */
3218	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3058	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3219	{
3220	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)	3059	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
		3060	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3221	{	3061	{
3222	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3223	{
3224	if (x && y)	3062	if (x && y)
3225	x = EXIT_ALT_X (tmp), y = EXIT_ALT_Y (tmp);	3063	x = EXIT_ALT_X (tmp), y = EXIT_ALT_Y (tmp);
3226		3064
3227	return 1;	3065	return 1;
3228	}
3229	}	3066	}
3230	}
3231		3067
3232	if (x && y)	3068	if (x && y)
3233	x = EXIT_X (tmp), y = EXIT_Y (tmp);	3069	x = EXIT_X (tmp), y = EXIT_Y (tmp);
3234		3070
3235	return 1;	3071	return 1;
…		…
3392	new_draw_info (NDI_UNIQUE \| NDI_BLUE, 0, who, item->msg);	3228	new_draw_info (NDI_UNIQUE \| NDI_BLUE, 0, who, item->msg);
3393	}	3229	}
3394	else	3230	else
3395	{	3231	{
3396	/* generate misc. treasure */	3232	/* generate misc. treasure */
3397	tmp = arch_to_object (tr->item);	3233	tmp = tr->item->instance ();
3398	new_draw_info_format (NDI_UNIQUE \| NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3234	new_draw_info_format (NDI_UNIQUE \| NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3399	who->insert (tmp);	3235	who->insert (tmp);
3400	}	3236	}
3401	}	3237	}
3402		3238
3403	/**	3239	//-GPL
3404	* Unready an object for a player. This function does nothing if the object was
3405	* not readied.
3406	*/
3407	void
3408	player_unready_range_ob (player pl, object ob)
3409	{
3410	if (pl->ob->current_weapon == ob)
3411	pl->ob->current_weapon = 0;
3412
3413	if (pl->combat_ob == ob)
3414	pl->combat_ob = 0;
3415
3416	if (pl->ranged_ob == ob)
3417	pl->ranged_ob = 0;
3418	}
3419		3240
3420	sint8	3241	sint8
3421	player::darkness_at (maptile *map, int x, int y) const	3242	player::darkness_at (maptile *map, int x, int y) const
3422	{	3243	{
3423	if (!ns)	3244	if (!ns)

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.220 by root, Sun Dec 28 16:35:32 2008 UTC vs. Revision 1.263 by root, Sat Apr 3 22:30:21 2010 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.220 by root, Sun Dec 28 16:35:32 2008 UTC vs.
Revision 1.263 by root, Sat Apr 3 22:30:21 2010 UTC