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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.222 by root, Thu Jan 1 11:41:17 2009 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)	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)
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, shstr_cmp 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
…		…
1334	}	1259	}
1335	}	1260	}
1336	else if (arrow->type == ARROW && arrow->race == type)	1261	else if (arrow->type == ARROW && arrow->race == type)
1337	{	1262	{
1338	/* allways prefer assasination/slaying */	1263	/* allways prefer assasination/slaying */
1339	if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))	1264	if (target->race && arrow->slaying.contains (target->race))
1340	{	1265	{
1341	if (arrow->attacktype & AT_DEATH)	1266	if (arrow->attacktype & AT_DEATH)
1342	{	1267	{
1343	*better = 100;	1268	*better = 100;
1344	return arrow;	1269	return arrow;
…		…
1388	* find_better_arrow to find a decent arrow to use.	1313	* find_better_arrow to find a decent arrow to use.
1389	* op = the shooter	1314	* op = the shooter
1390	* type = bow->race	1315	* type = bow->race
1391	* dir = fire direction	1316	* dir = fire direction
1392	*/	1317	*/
1393	object *	1318	static object *
1394	pick_arrow_target (object *op, shstr_cmp type, int dir)	1319	pick_arrow_target (object *op, shstr_cmp type, int dir)
1395	{	1320	{
1396	object *tmp = NULL;	1321	object *tmp = NULL;
1397	maptile *m;	1322	maptile *m;
1398	int i, mflags, found, number;	1323	int i, mflags, found, number;
…		…
1485	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1410	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1486	return 0;	1411	return 0;
1487	}	1412	}
1488		1413
1489	// 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
1490	if (bow->below)	1415	splay (bow);
1491	{
1492	bow->remove ();
1493	op->insert (bow);
1494	}
1495	}	1416	}
1496		1417
1497	if (!bow->race \|\| !bow->skill)	1418	if (!bow->race \|\| !bow->skill)
1498	{	1419	{
1499	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);
…		…
1545	arrow->direction = dir;	1466	arrow->direction = dir;
1546		1467
1547	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 */
1548	arrow->stats.hp = arrow->stats.dam;	1469	arrow->stats.hp = arrow->stats.dam;
1549	arrow->stats.grace = arrow->attacktype;	1470	arrow->stats.grace = arrow->attacktype;
1550		1471	arrow->custom_name = arrow->slaying;
1551	if (arrow->slaying)
1552	arrow->spellarg = strdup (arrow->slaying);
1553		1472
1554	#if 0	1473	#if 0
1555	if (player *pl = op->contr)	1474	if (player *pl = op->contr)
1556	{	1475	{
1557	float speed = pl->weapon_sp;	1476	float speed = pl->weapon_sp;
…		…
1619	* but monsters can't. Putting that code here	1538	* but monsters can't. Putting that code here
1620	* makes the fire_bow code much cleaner.	1539	* makes the fire_bow code much cleaner.
1621	* this function should only be called if 'op' is a player,	1540	* this function should only be called if 'op' is a player,
1622	* hence the function name.	1541	* hence the function name.
1623	*/	1542	*/
1624	int	1543	static int
1625	player_fire_bow (object *op, int dir)	1544	player_fire_bow (object *op, int dir)
1626	{	1545	{
1627	int ret;	1546	int ret;
1628		1547
1629	if (op->contr->bowtype == bow_bestarrow)	1548	if (op->contr->bowtype == bow_bestarrow)
…		…
1657	}	1576	}
1658		1577
1659	/* Fires a misc (wand/rod/horn) object in 'dir'.	1578	/* Fires a misc (wand/rod/horn) object in 'dir'.
1660	* Broken apart from 'fire' to keep it more readable.	1579	* Broken apart from 'fire' to keep it more readable.
1661	*/	1580	*/
1662	void	1581	static void
1663	fire_misc_object (object *op, int dir)	1582	fire_misc_object (object *op, int dir)
1664	{	1583	{
1665	object *item = op->contr->ranged_ob;	1584	object *item = op->contr->ranged_ob;
1666		1585
1667	if (!item)	1586	if (!item)
…		…
1674	{	1593	{
1675	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1594	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1676	return;	1595	return;
1677	}	1596	}
1678		1597
1679	if (!op->change_weapon (item))	1598	if (!op->apply (item))
1680	return;	1599	return;
1681		1600
1682	if (item->type == WAND)	1601	if (item->type == WAND)
1683	{	1602	{
1684	if (item->stats.food <= 0)	1603	if (item->stats.food <= 0)
…		…
1689	return;	1608	return;
1690	}	1609	}
1691	}	1610	}
1692	else if (item->type == ROD \|\| item->type == HORN)	1611	else if (item->type == ROD \|\| item->type == HORN)
1693	{	1612	{
1694	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);
1695		1614
1696	// 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
1697	// for a rod or horn, this fixes some broken rods.	1616	// for a rod or horn, this fixes some broken rods.
1698	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))	1617	if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1699	{	1618	{
1700	op->contr->play_sound (sound_find ("wand_poof"));	1619	op->contr->play_sound (sound_find ("wand_poof"));
1701		1620
1702	if (item->type == ROD)	1621	if (item->type == ROD)
1703	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));
…		…
1735	}	1654	}
1736		1655
1737	/* Received a fire command for the player - go and do it.	1656	/* Received a fire command for the player - go and do it.
1738	*/	1657	*/
1739	bool	1658	bool
1740	fire (object *op, int dir)	1659	fire (object *who, int dir)
1741	{	1660	{
1742	int spellcost = 0;	1661	int spellcost = 0;
1743		1662
1744	player *pl = op->contr;	1663	player *pl = who->contr;
1745		1664
1746	if (pl->golem)	1665	if (pl->golem)
1747	{	1666	{
1748	control_golem (op->contr->golem, dir);	1667	control_golem (who->contr->golem, dir);
1749	return false;	1668	return false;
1750	}	1669	}
1751		1670
1752	object *ob = pl->ranged_ob;	1671	object *ob = pl->ranged_ob;
1753		1672
1754	if (!ob)	1673	if (!ob)
1755	return false;	1674	return false;
1756		1675
1757	if (op->speed_left > 0.f)	1676	if (who->speed_left > 0.f)
1758	--op->speed_left;	1677	--who->speed_left;
1759	else	1678	else
1760	return false;	1679	return false;
1761		1680
1762	if (!op->change_weapon (ob))	1681	if (!who->apply (ob))
1763	return false;	1682	return false;
1764		1683
1765	/* check for loss of invisiblity/hide */	1684	/* check for loss of invisiblity/hide */
1766	if (action_makes_visible (op))	1685	if (action_makes_visible (who))
1767	make_visible (op);	1686	make_visible (who);
1768		1687
1769	switch (ob->type)	1688	switch (ob->type)
1770	{	1689	{
1771	case BOW:	1690	case BOW:
1772	player_fire_bow (op, dir);	1691	player_fire_bow (who, dir);
1773	break;	1692	break;
1774		1693
1775	case SPELL:	1694	case SPELL:
1776	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);
1777	break;	1696	break;
1778		1697
1779	case BUILDER:	1698	case BUILDER:
1780	apply_map_builder (op, dir);	1699	apply_map_builder (who, dir);
1781	break;	1700	break;
1782		1701
1783	case SKILL:	1702	case SKILL:
1784	do_skill (op, op, ob, dir, 0);	1703	do_skill (who, who, ob, dir, 0);
1785	break;	1704	break;
1786		1705
		1706	case RANGED:
		1707	do_skill (who, ob, who->chosen_skill, dir, 0);
		1708	break;
		1709
1787	default:	1710	default:
1788	fire_misc_object (op, dir);	1711	fire_misc_object (who, dir);
1789	break;	1712	break;
1790	}	1713	}
1791		1714
1792	return true;	1715	return true;
1793	}	1716	}
1794		1717
1795	/* find_key	1718	static object *
1796	* We try to find a key for the door as passed. If we find a key
1797	* and successfully use it, we return the key, otherwise NULL
1798	* This function merges both normal and locked door, since the logic
1799	* for both is the same - just the specific key is different.
1800	* pl is the player,
1801	* inv is the objects inventory to searched
1802	* door is the door we are trying to match against.
1803	* This function can be called recursively to search containers.
1804	*/
1805	object *
1806	find_key (object pl, object container, object *door)	1719	find_key_ (object pl, object container, object *door)
1807	{	1720	{
1808	object tmp, key;	1721	object tmp, key;
1809		1722
1810	/* Should not happen, but sanity checking is never bad */	1723	/* Should not happen, but sanity checking is never bad */
1811	if (!container->inv)	1724	if (!container->inv)
…		…
1814	/* 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 */
1815	for (tmp = container->inv; tmp; tmp = tmp->below)	1728	for (tmp = container->inv; tmp; tmp = tmp->below)
1816	{	1729	{
1817	if (door->type == DOOR && tmp->type == KEY)	1730	if (door->type == DOOR && tmp->type == KEY)
1818	break;	1731	break;
		1732
1819	/* For sanity, we should really check door type, but other stuff	1733	/* For sanity, we should really check door type, but other stuff
1820	* (like containers) can be locked with special keys	1734	* (like containers) can be locked with special keys
1821	*/	1735	*/
1822	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1736	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1823	break;	1737	break;
…		…
1829	* a key, return	1743	* a key, return
1830	*/	1744	*/
1831	if (!tmp)	1745	if (!tmp)
1832	{	1746	{
1833	for (tmp = container->inv; tmp; tmp = tmp->below)	1747	for (tmp = container->inv; tmp; tmp = tmp->below)
1834	{
1835	/* No reason to search empty containers */	1748	/* No reason to search empty containers */
1836	if (tmp->type == CONTAINER && tmp->inv)	1749	if (tmp->type == CONTAINER && tmp->inv)
1837	{
1838	if ((key = find_key (pl, tmp, door)))	1750	if ((key = find_key_ (pl, tmp, door)))
1839	return key;	1751	return key;
1840	}
1841	}
1842		1752
1843	if (!tmp)	1753	if (!tmp)
1844	return NULL;	1754	return 0;
1845	}	1755	}
1846		1756
1847	/* 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,
1848	* see if we actually want to use it	1758	* see if we actually want to use it
1849	*/	1759	*/
1850	if (pl != container)	1760	if (pl != container)
1851	{	1761	{
1852	/* Only let players use keys in containers */	1762	/* Only let players use keys in containers */
1853	if (!pl->contr)	1763	if (!pl->contr)
1854	return NULL;	1764	return 0;
		1765
1855	/* cases where this fails:	1766	/* cases where this fails:
1856	* If we only search the player inventory, return now since we	1767	* If we only search the player inventory, return now since we
1857	* are not in the players inventory.	1768	* are not in the players inventory.
1858	* If the container is not active, return now since only active	1769	* If the container is not active, return now since only active
1859	* containers can be used.	1770	* containers can be used.
…		…
1863	* inv must have been an container and must have been active.	1774	* inv must have been an container and must have been active.
1864	*	1775	*
1865	* Change the color so that the message doesn't disappear with	1776	* Change the color so that the message doesn't disappear with
1866	* all the others.	1777	* all the others.
1867	*/	1778	*/
1868	if (pl->contr->usekeys == key_inventory \|\|	1779	if (pl->contr->usekeys == key_inventory
1869	!QUERY_FLAG (container, FLAG_APPLIED) \|\|	1780	\|\| !QUERY_FLAG (container, FLAG_APPLIED)
1870	(pl->contr->usekeys == keyrings && (!container->race \|\| strcmp (container->race, "keys"))))	1781	\|\| (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1871	{	1782	{
1872	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,	1783	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,
1873	"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));
1874	return NULL;	1785	return NULL;
1875	}	1786	}
1876	}	1787	}
1877		1788
1878	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);
1879	}	1815	}
1880		1816
1881	/* moved door processing out of move_player_attack.	1817	/* moved door processing out of move_player_attack.
1882	* returns 1 if player has opened the door with a key	1818	* returns 1 if player has opened the door with a key
1883	* such that the caller should not do anything more,	1819	* such that the caller should not do anything more,
…		…
1933	* going to try and move (not fire weapons).	1869	* going to try and move (not fire weapons).
1934	*/	1870	*/
1935	bool	1871	bool
1936	move_player_attack (object *op, int dir)	1872	move_player_attack (object *op, int dir)
1937	{	1873	{
1938	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	}
1939		1879
1940	sint16 nx = freearr_x[dir] + op->x;	1880	sint16 nx = freearr_x[dir] + op->x;
1941	sint16 ny = freearr_y[dir] + op->y;	1881	sint16 ny = freearr_y[dir] + op->y;
1942		1882
1943	on_battleground = op_on_battleground (op, 0, 0);
1944
1945	if (out_of_map (op->map, nx, ny))	1883	if (out_of_map (op->map, nx, ny))
1946	return false;	1884	return false;
1947
1948	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
1949	{
1950	--op->speed_left;
1951	return true;
1952	}
1953		1885
1954	/* 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
1955	* 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
1956	* 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
1957	* player. This is a pretty nasty hack, because if we could	1889	* player. This is a pretty nasty hack, because if we could
…		…
2026	}	1958	}
2027	else	1959	else
2028	return false;	1960	return false;
2029	}	1961	}
2030		1962
		1963	bool on_battleground = op_on_battleground (op, 0, 0);
		1964
2031	/* in certain circumstances, you shouldn't attack friendly	1965	/* in certain circumstances, you shouldn't attack friendly
2032	* creatures. Note that if you are braced, you can't push	1966	* creatures. Note that if you are braced, you can't push
2033	* 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
2034	* attack them either.	1968	* attack them either.
2035	*/	1969	*/
…		…
2099	}	2033	}
2100		2034
2101	bool	2035	bool
2102	move_player (object *op, int dir)	2036	move_player (object *op, int dir)
2103	{	2037	{
2104	int pick;
2105
2106	if (!op->map \|\| op->map->in_memory != MAP_ACTIVE)	2038	if (!op->map \|\| op->map->in_memory != MAP_ACTIVE)
2107	return 0;	2039	return 0;
2108		2040
2109	/* Sanity check: make sure dir is valid */	2041	/* Sanity check: make sure dir is valid */
2110	if ((dir < 0) \|\| (dir >= 9))	2042	if (dir < 0 \|\| dir >= 9)
2111	{	2043	{
2112	LOG (llevError, "move_player: invalid direction %d\n", dir);	2044	LOG (llevError, "move_player: invalid direction %d\n", dir);
2113	return 0;	2045	return 0;
2114	}	2046	}
2115		2047
…		…
2121		2053
2122	if (op->flag [FLAG_HIDDEN])	2054	if (op->flag [FLAG_HIDDEN])
2123	do_hidden_move (op);	2055	do_hidden_move (op);
2124		2056
2125	bool retval;	2057	bool retval;
		2058	int pick = 0;
2126		2059
2127	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2060	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2128	retval = RESULT_INT (0);	2061	retval = RESULT_INT (0);
2129	else if (op->contr->fire_on)	2062	else if (op->contr->fire_on)
2130	retval = fire (op, dir);	2063	retval = fire (op, dir);
…		…
2187	return move_player (op, op->direction);	2120	return move_player (op, op->direction);
2188		2121
2189	return false;	2122	return false;
2190	}	2123	}
2191		2124
2192	int	2125	static int
2193	save_life (object *op)	2126	save_life (object *op)
2194	{	2127	{
2195	if (!QUERY_FLAG (op, FLAG_LIFESAVE))	2128	if (!QUERY_FLAG (op, FLAG_LIFESAVE))
2196	return 0;	2129	return 0;
2197		2130
…		…
2206		2139
2207	if (op->stats.hp < 0)	2140	if (op->stats.hp < 0)
2208	op->stats.hp = op->stats.maxhp;	2141	op->stats.hp = op->stats.maxhp;
2209		2142
2210	if (op->stats.food < 0)	2143	if (op->stats.food < 0)
2211	op->stats.food = 999;	2144	op->stats.food = MAX_FOOD;
2212		2145
2213	op->update_stats ();	2146	op->update_stats ();
2214	return 1;	2147	return 1;
2215	}	2148	}
2216		2149
…		…
2244	void	2177	void
2245	object::drop_unpaid_items ()	2178	object::drop_unpaid_items ()
2246	{	2179	{
2247	if (!flag [FLAG_REMOVED])	2180	if (!flag [FLAG_REMOVED])
2248	::drop_unpaid_items (inv, this);	2181	::drop_unpaid_items (inv, this);
2249	}
2250
2251	/*
2252	* Returns pointer a static string containing gravestone text
2253	* Moved from apply.c to player.c - player.c is what
2254	* actually uses this function. player.c may not be quite the
2255	* best, a misc file for object actions is probably better,
2256	* but there isn't one in the server directory.
2257	*/
2258	const char *
2259	gravestone_text (object *op)
2260	{
2261	static dynbuf_text buf;
2262
2263	buf << "---- R.I.P. ----\n\n"
2264	<< op->name;
2265
2266	if (op->type == PLAYER)
2267	buf << " the " << op->contr->title;
2268
2269	buf << "\n\n";
2270
2271	buf << "who was level ";
2272	buf << (sint32)op->level << "\n\n" // OO breakdown
2273	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
2274
2275	if (op->type == PLAYER)
2276	buf << "by " << op->contr->killer_name () << ".\n\n";
2277
2278	{
2279	static char buf2[128];
2280	time_t now = time (NULL);
2281	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2282	buf << buf2;
2283	}
2284
2285	return buf;
2286	}	2182	}
2287		2183
2288	void	2184	void
2289	do_some_living (object *op)	2185	do_some_living (object *op)
2290	{	2186	{
…		…
2482		2378
2483	if (tmp->type == FOOD \|\| tmp->type == DRINK \|\| tmp->type == POISON)	2379	if (tmp->type == FOOD \|\| tmp->type == DRINK \|\| tmp->type == POISON)
2484	{	2380	{
2485	op->statusmsg ("You blindly grab for a bite of food. "	2381	op->statusmsg ("You blindly grab for a bite of food. "
2486	"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.>");
2487	manual_apply (op, tmp, 0);	2383	op->apply (tmp);
2488		2384
2489	if (op->stats.food >= 0 \|\| op->stats.hp < 0)	2385	if (op->stats.food >= 0 \|\| op->stats.hp < 0)
2490	break;	2386	break;
2491	}	2387	}
2492	else if (tmp->type == FLESH)	2388	else if (tmp->type == FLESH)
…		…
2498	*/	2394	*/
2499	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2395	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2500	{	2396	{
2501	op->statusmsg ("You blindly grab for a bite of food. "	2397	op->statusmsg ("You blindly grab for a bite of food. "
2502	"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.>");
2503	manual_apply (op, flesh, 0);	2399	op->apply (flesh);
2504	}	2400	}
2505		2401
2506	// If player is still starving, alert him!	2402	// If player is still starving, alert him!
2507	if (op->stats.food < 0)	2403	if (op->stats.food < 0)
2508	op->failmsg ("You are starving! "	2404	op->failmsg ("You are starving! "
…		…
2534	*/	2430	*/
2535	void	2431	void
2536	kill_player (object *op)	2432	kill_player (object *op)
2537	{	2433	{
2538	int x, y;	2434	int x, y;
2539	char buf[MAX_BUF];
2540	maptile map; / this is for resurrection */	2435	maptile map; / this is for resurrection */
2541	int will_kill_again;	2436	int will_kill_again;
2542	archetype *at;	2437	archetype *at;
2543	object *tmp;	2438	object *tmp;
2544		2439
2545	if (save_life (op))	2440	if (save_life (op))
2546	return;	2441	return;
2547		2442
		2443	dynbuf_text deathtab;
		2444
2548	/* restore player */	2445	/* restore player */
2549	at = archetype::find ("poisoning");	2446	at = archetype::find (shstr_poisoning);
2550	if (object *tmp = present_arch_in_ob (at, op))	2447	if (object *tmp = present_arch_in_ob (at, op))
2551	{	2448	{
2552	tmp->destroy ();	2449	tmp->destroy ();
2553	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");	2450	deathtab << "Your body feels cleansed...\r";
2554	}	2451	}
2555		2452
2556	at = archetype::find ("confusion");	2453	at = archetype::find (shstr_confusion);
2557	if (object *tmp = present_arch_in_ob (at, op))	2454	if (object *tmp = present_arch_in_ob (at, op))
2558	{	2455	{
2559	tmp->destroy ();	2456	tmp->destroy ();
2560	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2457	deathtab << "Your mind feels clearer...\r";
2561	}	2458	}
2562		2459
2563	cure_disease (op, 0, 0); /* remove any disease */	2460	cure_disease (op, 0, 0); /* remove any disease */
2564		2461
2565	max_it (op->stats.hp , op->stats.maxhp);	2462	max_it (op->stats.hp , op->stats.maxhp);
2566	max_it (op->stats.sp , op->stats.maxsp);	2463	max_it (op->stats.sp , op->stats.maxsp);
2567	max_it (op->stats.grace, op->stats.maxgrace);	2464	max_it (op->stats.grace, op->stats.maxgrace);
2568
2569	if (op->stats.food <= 0)	2465	max_it (op->stats.food , 200);
2570	op->stats.food = 999;
2571		2466
2572	// remove all spell effects that are active	2467	// remove all spell effects that are active
2573	// to avoid long-term effects such as word-of-recall	2468	// to avoid long-term effects such as word-of-recall
2574	for (object *item = op->inv; item; )	2469	for (object *item = op->inv; item; )
2575	{	2470	{
…		…
2585	* 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.
2586	* Look at op_on_battleground() for more info --AndreasV	2481	* Look at op_on_battleground() for more info --AndreasV
2587	*/	2482	*/
2588	if (op_on_battleground (op, &x, &y))	2483	if (op_on_battleground (op, &x, &y))
2589	{	2484	{
2590	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";
2591	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, "Local medics have saved your life...");
2592		2486
2593	/* create a bodypart-trophy to make the winner happy */	2487	/* create a bodypart-trophy to make the winner happy */
2594	if (object *tmp = arch_to_object (archetype::find ("finger")))	2488	object *tmp = archetype::find (shstr_finger)->instance ();
2595	{	2489
2596	tmp->name = format ("%s's finger" , &op->name);	2490	tmp->name = format ("%s's finger" , &op->name);
2597	tmp->name_pl = format ("%s's fingers", &op->name);	2491	tmp->name_pl = format ("%s's fingers", &op->name);
2598	tmp->msg = format (	2492	tmp->msg = format (
2599	"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",
2600	&op->name, op->contr->title,	2494	&op->name, op->contr->title,
2601	(int)op->level,	2495	(int)op->level,
2602	op->contr->killer_name ()	2496	op->contr->killer_name ()
2603	);	2497	);
2604	tmp->value = 0, tmp->type = 0;	2498	tmp->value = 0, tmp->type = 0;
2605	tmp->materialname = "organics";	2499	tmp->material = name_to_material (shstr_organic);
2606	tmp->insert_at (op, tmp);	2500	tmp->insert_at (op, tmp);
2607	}
2608		2501
2609	/* teleport defeated player to new destination */	2502	/* teleport defeated player to new destination */
2610	transfer_ob (op, x, y, 0, NULL);	2503	transfer_ob (op, x, y, 0, NULL);
2611	op->contr->braced = 0;	2504	op->contr->braced = 0;
		2505
		2506	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2612	return;	2507	return;
2613	}	2508	}
		2509
		2510	deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
		2511	deathtab << "T<YOU HAVE DIED>\n\n";
2614		2512
2615	INVOKE_PLAYER (DEATH, op->contr);	2513	INVOKE_PLAYER (DEATH, op->contr);
2616		2514
2617	command_kill_pets (op, 0);	2515	command_kill_pets (op, 0);
2618		2516
…		…
2669	lost_a_stat = 1;	2567	lost_a_stat = 1;
2670	}	2568	}
2671	else	2569	else
2672	{	2570	{
2673	/* deplete a stat */	2571	/* deplete a stat */
2674	archetype *deparch = archetype::find ("depletion");	2572	archetype *deparch = archetype::find (shstr_depletion);
2675	object *dep;	2573	object *dep;
2676		2574
2677	dep = present_arch_in_ob (deparch, op);	2575	dep = present_arch_in_ob (deparch, op);
2678	if (!dep)	2576	if (!dep)
2679	{	2577	{
2680	dep = arch_to_object (deparch);	2578	dep = deparch->instance ();
2681	insert_ob_in_ob (dep, op);	2579	insert_ob_in_ob (dep, op);
2682	}	2580	}
2683	lose_this_stat = 1;	2581	lose_this_stat = 1;
2684	if (settings.balanced_stat_loss)	2582	if (settings.balanced_stat_loss)
2685	{	2583	{
…		…
2740	/* determine_god() seems to not work sometimes... why is this?	2638	/* determine_god() seems to not work sometimes... why is this?
2741	Should I be using something else? GD */	2639	Should I be using something else? GD */
2742	shstr_tmp god = determine_god (op);	2640	shstr_tmp god = determine_god (op);
2743		2641
2744	if (god != shstr_none)	2642	if (god != shstr_none)
2745	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";
2746	else	2644	else
2747	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";
2748	}	2646	}
2749	#else	2647	#else
2750	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.";
2751	#endif	2649	#endif
2752		2650
2753	/* Put a gravestone up where the character 'almost' died. List the	2651	/* Put a gravestone up where the character 'almost' died. List the
2754	* exp loss on the stone.	2652	* exp loss on the stone.
2755	*/	2653	*/
2756	tmp = arch_to_object (archetype::find ("gravestone"));	2654	tmp = archetype::find (shstr_gravestone)->instance ();
2757	tmp->name = format ("%s's gravestone", &op->name);	2655	tmp->name = format ("%s's gravestone", &op->name);
2758	tmp->name_pl = format ("%s's gravestones", &op->name);	2656	tmp->name_pl = format ("%s's gravestones", &op->name);
2759	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",
2760	&op->name, op->contr->title, op->contr->killer_name ());	2658	&op->name, op->contr->title, op->contr->killer_name ());
2761	tmp->x = op->x, tmp->y = op->y;	2659	tmp->x = op->x, tmp->y = op->y;
…		…
2813		2711
2814	insert_ob_in_ob (force, op);	2712	insert_ob_in_ob (force, op);
2815	op->update_stats ();	2713	op->update_stats ();
2816	}	2714	}
2817		2715
2818	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	2716	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2819	}	2717	}
2820		2718
2821	void	2719	static void
2822	loot_object (object *op)	2720	loot_object (object *op)
2823	{ /* Grab and destroy some treasure */	2721	{ /* Grab and destroy some treasure */
2824	object tmp, tmp2, *next;	2722	object tmp, tmp2, *next;
2825		2723
2826	op->close_container (); /* close open sack first */	2724	op->close_container (); /* close open sack first */
…		…
2857	* fix_weight(): Check recursively the weight of all players, and fix	2755	* fix_weight(): Check recursively the weight of all players, and fix
2858	* 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
2859	* was changed.	2757	* was changed.
2860	*/	2758	*/
2861	void	2759	void
2862	fix_weight (void)	2760	fix_weight ()
2863	{	2761	{
2864	for_all_players (pl)	2762	for_all_players (pl)
2865	{	2763	{
2866	sint32 old = pl->ob->carrying;	2764	sint32 old = pl->ob->carrying;
2867		2765
…		…
2874	}	2772	}
2875	}	2773	}
2876	}	2774	}
2877		2775
2878	void	2776	void
2879	fix_luck (void)	2777	fix_luck ()
2880	{	2778	{
2881	for_all_players (pl)	2779	for_all_players (pl)
2882	if (!pl->ob->contr->ns->state)	2780	if (!pl->ob->contr->ns->state)
2883	pl->ob->change_luck (0);	2781	pl->ob->change_luck (0);
2884	}	2782	}
…		…
2961	level = ob->map->darklevel () - 2;	2859	level = ob->map->darklevel () - 2;
2962		2860
2963	/* this also picks up whether the object is glowing.	2861	/* this also picks up whether the object is glowing.
2964	* 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
2965	* as bad as carrying a light on a pitch dark map */	2863	* as bad as carrying a light on a pitch dark map */
2966	if (has_carried_lights (ob))	2864	if (ob->has_carried_lights ())
2967	level = -(10 + (2 * ob->map->darklevel ()));	2865	level = -(10 + (2 * ob->map->darklevel ()));
2968		2866
2969	/* scan through all nearby squares for terrain to hide in */	2867	/* scan through all nearby squares for terrain to hide in */
2970	for (i = 0, x = ob->x, y = ob->y;	2868	for (i = 0, x = ob->x, y = ob->y;
2971	i <= SIZEOFFREE1;	2869	i <= SIZEOFFREE1;
…		…
3128	}	3026	}
3129		3027
3130	return 0;	3028	return 0;
3131	}	3029	}
3132		3030
3133	/* routine for both players and monsters. We call this when
3134	* there is a possibility for our action distrubing our hiding
3135	* place or invisiblity spell. Artefact invisiblity causes
3136	* "noise" instead. If we arent invisible to begin with, we
3137	* return 0.
3138	*/
3139	int
3140	action_makes_visible (object *op)
3141	{
3142	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3143	{
3144	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3145	{
3146	// artefact invisibility is permanent, but we still make noise
3147	// this is important for game-balance.
3148	if (op->contr)
3149	op->make_noise ();
3150
3151	return 0;
3152	}
3153
3154	if (op->contr && op->contr->tmp_invis == 0)
3155	return 0;
3156
3157	/* If monsters, they should become visible */
3158	if (op->flag [FLAG_HIDDEN] \|\| !op->contr \|\| (op->contr && op->contr->tmp_invis))
3159	{
3160	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3161	return 1;
3162	}
3163	}
3164
3165	return 0;
3166	}
3167
3168	/* op_on_battleground - checks if the given object op (usually	3031	/* op_on_battleground - checks if the given object op (usually
3169	* a player) is standing on a valid battleground-tile,	3032	* a player) is standing on a valid battleground-tile,
3170	* function returns TRUE/FALSE. If true x, y returns the battleground	3033	* function returns TRUE/FALSE. If true x, y returns the battleground
3171	* -exit-coord. (and if x, y not NULL)	3034	* -exit-coord. (and if x, y not NULL)
3172	* 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
…		…
3191	&& tmp->name == shstr_battleground	3054	&& tmp->name == shstr_battleground
3192	&& EXIT_X (tmp) && EXIT_Y (tmp))	3055	&& EXIT_X (tmp) && EXIT_Y (tmp))
3193	{	3056	{
3194	/* before we assign the exit, check if this is a teambattle */	3057	/* before we assign the exit, check if this is a teambattle */
3195	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))
3196	{
3197	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)
3198	{	3061	{
3199	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3200	{
3201	if (x && y)	3062	if (x && y)
3202	x = EXIT_ALT_X (tmp), y = EXIT_ALT_Y (tmp);	3063	x = EXIT_ALT_X (tmp), y = EXIT_ALT_Y (tmp);
3203		3064
3204	return 1;	3065	return 1;
3205	}
3206	}	3066	}
3207	}
3208		3067
3209	if (x && y)	3068	if (x && y)
3210	x = EXIT_X (tmp), y = EXIT_Y (tmp);	3069	x = EXIT_X (tmp), y = EXIT_Y (tmp);
3211		3070
3212	return 1;	3071	return 1;
…		…
3369	new_draw_info (NDI_UNIQUE \| NDI_BLUE, 0, who, item->msg);	3228	new_draw_info (NDI_UNIQUE \| NDI_BLUE, 0, who, item->msg);
3370	}	3229	}
3371	else	3230	else
3372	{	3231	{
3373	/* generate misc. treasure */	3232	/* generate misc. treasure */
3374	tmp = arch_to_object (tr->item);	3233	tmp = tr->item->instance ();
3375	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));
3376	who->insert (tmp);	3235	who->insert (tmp);
3377	}	3236	}
3378	}	3237	}
3379		3238
3380	/**	3239	//-GPL
3381	* Unready an object for a player. This function does nothing if the object was
3382	* not readied.
3383	*/
3384	void
3385	player_unready_range_ob (player pl, object ob)
3386	{
3387	if (pl->ob->current_weapon == ob)
3388	pl->ob->current_weapon = 0;
3389
3390	if (pl->combat_ob == ob)
3391	pl->combat_ob = 0;
3392
3393	if (pl->ranged_ob == ob)
3394	pl->ranged_ob = 0;
3395	}
3396		3240
3397	sint8	3241	sint8
3398	player::darkness_at (maptile *map, int x, int y) const	3242	player::darkness_at (maptile *map, int x, int y) const
3399	{	3243	{
3400	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.222 by root, Thu Jan 1 11:41:17 2009 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.222 by root, Thu Jan 1 11:41:17 2009 UTC vs.
Revision 1.263 by root, Sat Apr 3 22:30:21 2010 UTC