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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.244 by root, Sun May 18 17:52:53 2008 UTC vs.
Revision 1.321 by root, Sat Apr 10 04:54:09 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 (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001 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	*/
23		24
24	#include <global.h>	25	#include <global.h>
25	#include <stdio.h>	26	#include <stdio.h>
26	#include <sys/types.h>	27	#include <sys/types.h>
27	#include <sys/uio.h>	28	#include <sys/uio.h>
28	#include <object.h>	29	#include <object.h>
29	#include <sproto.h>	30	#include <sproto.h>
30	#include <loader.h>
31		31
32	#include <bitset>	32	#include <bitset>
33		33
34	UUID UUID::cur;	34	UUID UUID::cur;
35	static uint64_t seq_next_save;	35	static uint64_t seq_next_save;
36	static const uint64 UUID_GAP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
		37	uint32_t mapspace::smellcount = 10000;
37		38
38	objectvec objects;	39	objectvec objects;
39	activevec actives;	40	activevec actives;
		41
		42	//+GPL
40		43
41	short freearr_x[SIZEOFFREE] = {	44	short freearr_x[SIZEOFFREE] = {
42	0,	45	0,
43	0, 1, 1, 1, 0, -1, -1, -1,	46	0, 1, 1, 1, 0, -1, -1, -1,
44	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	47	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
48	0,	51	0,
49	-1, -1, 0, 1, 1, 1, 0, -1,	52	-1, -1, 0, 1, 1, 1, 0, -1,
50	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	53	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
51	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	54	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
52	};	55	};
53	int maxfree[SIZEOFFREE] = {
54	0,
55	9, 10, 13, 14, 17, 18, 21, 22,
56	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
57	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
58	};
59	int freedir[SIZEOFFREE] = {	56	int freedir[SIZEOFFREE] = {
60	0,	57	0,
61	1, 2, 3, 4, 5, 6, 7, 8,	58	1, 2, 3, 4, 5, 6, 7, 8,
62	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	59	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
63	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	60	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
64	};	61	};
65		62
		63	static int maxfree[SIZEOFFREE] = {
		64	0,
		65	9, 10, 13, 14, 17, 18, 21, 22,
		66	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
		67	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
		68	};
		69
66	static void	70	static void
67	write_uuid (uval64 skip, bool sync)	71	write_uuid (uval64 skip, bool sync)
68	{	72	{
69	CALL_BEGIN (2);	73	CALL_BEGIN (2);
70	CALL_ARG_SV (newSVval64 (skip));	74	CALL_ARG_SV (newSVval64 (skip));
…		…
72	CALL_CALL ("cf::write_uuid", G_DISCARD);	76	CALL_CALL ("cf::write_uuid", G_DISCARD);
73	CALL_END;	77	CALL_END;
74	}	78	}
75		79
76	static void	80	static void
77	read_uuid (void)	81	read_uuid ()
78	{	82	{
79	char filename[MAX_BUF];	83	char filename[MAX_BUF];
80		84
81	sprintf (filename, "%s/uuid", settings.localdir);	85	sprintf (filename, "%s/uuid", settings.localdir);
82		86
…		…
96		100
97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	101	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98	_exit (1);	102	_exit (1);
99	}	103	}
100		104
101	UUID::BUF buf;	105	char buf [UUID::MAX_LEN];
102	buf[0] = 0;	106	buf[0] = 0;
103	fgets (buf, sizeof (buf), fp);	107	fgets (buf, sizeof (buf), fp);
104		108
105	if (!UUID::cur.parse (buf))	109	if (!UUID::cur.parse (buf))
106	{	110	{
…		…
133		137
134	void	138	void
135	UUID::init ()	139	UUID::init ()
136	{	140	{
137	read_uuid ();	141	read_uuid ();
		142	}
		143
		144	bool
		145	UUID::parse (const char *s)
		146	{
		147	if (s++ != '<' \|\| s++ != '1' \|\| *s++ != '.')
		148	return false;
		149
		150	seq = 0;
		151
		152	while (*s != '>')
		153	{
		154	if (*s < '0')
		155	return false;
		156
		157	// this gives nice branchless code with gcc
		158	assert ('0' < 'a' && '0' == 48 && 'a' == 97);
		159	int digit = (s + (s & 0x40 ? 9 : 0)) & 15;
		160
		161	seq = (seq << 4) \| digit;
		162
		163	++s;
		164	}
		165
		166	return true;
		167	}
		168
		169	char *
		170	UUID::append (char *buf) const
		171	{
		172	*buf++ = '<';
		173	*buf++ = '1';
		174	*buf++ = '.';
		175
		176	uint64_t seq = this->seq;
		177	const int bits = 64;
		178	char nz = 0;
		179	static const char tohex [] = "0123456789abcdef";
		180
		181	// assert (len >= 3 + bits / 4 + 1 + 1);
		182	for (int i = bits / 4; --i; )
		183	{
		184	uint8_t digit = seq >> (bits - 4);
		185
		186	*buf = tohex [digit];
		187	nz \|= digit;
		188	buf += nz ? 1 : 0;
		189	seq <<= 4;
		190	}
		191
		192	// last digit is special - always emit
		193	uint8_t digit = seq >> (bits - 4);
		194	*buf++ = tohex [digit];
		195
		196	*buf++ = '>';
		197
		198	return buf;
		199	}
		200
		201	char *
		202	UUID::c_str () const
		203	{
		204	static char buf [MAX_LEN];
		205	*append (buf) = 0;
		206	return buf;
138	}	207	}
139		208
140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	209	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
141	static bool	210	static bool
142	compare_ob_value_lists_one (const object wants, const object has)	211	compare_ob_value_lists_one (const object wants, const object has)
…		…
178	* Improvements made with merge: Better checking on potion, and also	247	* Improvements made with merge: Better checking on potion, and also
179	* check weight	248	* check weight
180	*/	249	*/
181	bool object::can_merge_slow (object ob1, object ob2)	250	bool object::can_merge_slow (object ob1, object ob2)
182	{	251	{
183	/* A couple quicksanity checks */	252	/* A couple quick sanity checks */
184	if (ob1 == ob2	253	if (ob1 == ob2
185	\|\| ob1->type != ob2->type	254	\|\| ob1->type != ob2->type
186	\|\| ob1->speed != ob2->speed
187	\|\| ob1->value != ob2->value	255	\|\| ob1->value != ob2->value
188	\|\| ob1->name != ob2->name)	256	\|\| ob1->name != ob2->name
		257	\|\| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
189	return 0;	258	return 0;
190		259
191	// some objects are unmergable
192	if (!ob1->nrof \|\| !ob2->nrof)
193	return 0;
194
195	/* Do not merge objects if nrof would overflow. First part checks	260	/* Do not merge objects if nrof would overflow, assume nrof
196	* for unsigned overflow (2c), second part checks whether the result	261	* is always 0 .. 2*31-1 /
197	* would fit into a 32 bit signed int, which is often used to hold	262	if (ob1->nrof > 0x7fffffff - ob2->nrof)
198	* nrof values.
199	*/
200	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
201	return 0;	263	return 0;
202		264
203	/* If the objects have been identified, set the BEEN_APPLIED flag.	265	/* If the objects have been identified, set the BEEN_APPLIED flag.
204	* This is to the comparison of the flags below will be OK. We	266	* This is to the comparison of the flags below will be OK. We
205	* just can't ignore the been applied or identified flags, as they	267	* just can't ignore the been applied or identified flags, as they
…		…
221	\|\| ob1->magic != ob2->magic	283	\|\| ob1->magic != ob2->magic
222	\|\| ob1->slaying != ob2->slaying	284	\|\| ob1->slaying != ob2->slaying
223	\|\| ob1->skill != ob2->skill	285	\|\| ob1->skill != ob2->skill
224	\|\| ob1->value != ob2->value	286	\|\| ob1->value != ob2->value
225	\|\| ob1->animation_id != ob2->animation_id	287	\|\| ob1->animation_id != ob2->animation_id
226	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other	288	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
227	\|\| ob1->client_type != ob2->client_type	289	\|\| ob1->client_type != ob2->client_type
228	\|\| ob1->materialname != ob2->materialname	290	\|\| ob1->material != ob2->material
229	\|\| ob1->lore != ob2->lore	291	\|\| ob1->lore != ob2->lore
230	\|\| ob1->subtype != ob2->subtype	292	\|\| ob1->subtype != ob2->subtype
231	\|\| ob1->move_type != ob2->move_type	293	\|\| ob1->move_type != ob2->move_type
232	\|\| ob1->move_block != ob2->move_block	294	\|\| ob1->move_block != ob2->move_block
233	\|\| ob1->move_allow != ob2->move_allow	295	\|\| ob1->move_allow != ob2->move_allow
234	\|\| ob1->move_on != ob2->move_on	296	\|\| ob1->move_on != ob2->move_on
235	\|\| ob1->move_off != ob2->move_off	297	\|\| ob1->move_off != ob2->move_off
236	\|\| ob1->move_slow != ob2->move_slow	298	\|\| ob1->move_slow != ob2->move_slow
237	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty	299	\|\| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
238	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	300	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
239	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	301	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
240	return 0;	302	return 0;
241		303
242	if ((ob1->flag ^ ob2->flag)	304	if ((ob1->flag ^ ob2->flag)
243	.reset (FLAG_INV_LOCKED)	305	.reset (FLAG_INV_LOCKED)
244	.reset (FLAG_CLIENT_SENT)
245	.reset (FLAG_REMOVED)	306	.reset (FLAG_REMOVED)
246	.any ())	307	.any ())
247	return 0;	308	return 0;
248		309
249	/* This is really a spellbook check - we should in general	310	/* This is really a spellbook check - we should in general
…		…
331	{	392	{
332	// see if we are in a container of sorts	393	// see if we are in a container of sorts
333	if (env)	394	if (env)
334	{	395	{
335	// the player inventory itself is always visible	396	// the player inventory itself is always visible
336	if (env->type == PLAYER)	397	if (env->is_player ())
337	return env;	398	return env;
338		399
339	// else a player could have our env open	400	// else a player could have our env open
340	object *envest = env->outer_env ();	401	object *envest = env->outer_env_or_self ();
341		402
342	// the player itself is always on a map, so we will find him here	403	// the player itself is always on a map, so we will find him here
343	// even if our inv is in a player.	404	// even if our inv is in a player.
344	if (envest->is_on_map ())	405	if (envest->is_on_map ())
345	if (object *pl = envest->ms ().player ())	406	if (object *pl = envest->ms ().player ())
346	if (pl->container == env)	407	if (pl->container_ () == env)
347	return pl;	408	return pl;
348	}	409	}
349	else	410	else
350	{	411	{
351	// maybe there is a player standing on the same mapspace	412	// maybe there is a player standing on the same mapspace
352	// this will catch the case where "this" is a player	413	// this will catch the case where "this" is a player
353	if (object *pl = ms ().player ())	414	if (object *pl = ms ().player ())
354	if (!pl->container \|\| this == pl->container)	415	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
		416	\|\| pl->container_ () == this)
355	return pl;	417	return pl;
356	}	418	}
357	}	419	}
358		420
359	return 0;	421	return 0;
…		…
437	object_freezer freezer;	499	object_freezer freezer;
438	op->write (freezer);	500	op->write (freezer);
439	return freezer.as_string ();	501	return freezer.as_string ();
440	}	502	}
441		503
442	/*	504	char *
443	* get_nearest_part(multi-object, object 2) returns the part of the	505	object::as_string ()
444	* multi-object 1 which is closest to the second object.
445	* If it's not a multi-object, it is returned.
446	*/
447	object *
448	get_nearest_part (object op, const object pl)
449	{	506	{
450	object tmp, closest;	507	return dump_object (this);
451	int last_dist, i;
452
453	if (!op->more)
454	return op;
455
456	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
457	tmp;
458	tmp = tmp->more)
459	if ((i = distance (tmp, pl)) < last_dist)
460	closest = tmp, last_dist = i;
461
462	return closest;
463	}	508	}
464		509
465	/*	510	/*
466	* Returns the object which has the count-variable equal to the argument.	511	* Returns the object which has the count-variable equal to the argument.
467	* VERRRY slow.	512	* VERRRY slow.
…		…
469	object *	514	object *
470	find_object (tag_t i)	515	find_object (tag_t i)
471	{	516	{
472	for_all_objects (op)	517	for_all_objects (op)
473	if (op->count == i)	518	if (op->count == i)
		519	return op;
		520
		521	return 0;
		522	}
		523
		524	/*
		525	* Returns the object which has the uuid equal to the argument.
		526	* MOAR VERRRY slow.
		527	*/
		528
		529	object *
		530	find_object_uuid (UUID i)
		531	{
		532	for_all_objects (op)
		533	if (op->uuid == i)
474	return op;	534	return op;
475		535
476	return 0;	536	return 0;
477	}	537	}
478		538
…		…
512	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());	572	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
513	return;	573	return;
514	}	574	}
515		575
516	this->owner = owner;	576	this->owner = owner;
517	}
518
519	int
520	object::slottype () const
521	{
522	if (type == SKILL)
523	{
524	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
525	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
526	}
527	else
528	{
529	if (slot [body_combat].info) return slot_combat;
530	if (slot [body_range ].info) return slot_ranged;
531	}
532
533	return slot_none;
534	}
535
536	bool
537	object::change_weapon (object *ob)
538	{
539	if (current_weapon == ob)
540	return true;
541
542	if (chosen_skill)
543	chosen_skill->flag [FLAG_APPLIED] = false;
544
545	current_weapon = ob;
546	chosen_skill = !ob \|\| ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
547
548	if (chosen_skill)
549	chosen_skill->flag [FLAG_APPLIED] = true;
550
551	update_stats ();
552
553	if (ob)
554	{
555	// now check wether any body locations became invalid, in which case
556	// we cannot apply the weapon at the moment.
557	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
558	if (slot[i].used < 0)
559	{
560	current_weapon = chosen_skill = 0;
561	update_stats ();
562
563	new_draw_info_format (NDI_UNIQUE, 0, this,
564	"You try to balance all your items at once, "
565	"but the %s is just too much for your body. "
566	"[You need to unapply some items first.]", &ob->name);
567	return false;
568	}
569
570	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
571	}
572	else
573	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
574
575	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
576	{
577	LOG (llevError \| logBacktrace, "%s changed to unapplied weapon %s",
578	&name, ob->debug_desc ());
579	return false;
580	}
581
582	return true;
583	}	577	}
584		578
585	/* Zero the key_values on op, decrementing the shared-string	579	/* Zero the key_values on op, decrementing the shared-string
586	* refcounts and freeing the links.	580	* refcounts and freeing the links.
587	*/	581	*/
…		…
640	tail = new_link;	634	tail = new_link;
641	}	635	}
642	}	636	}
643	}	637	}
644		638
645	if (speed < 0)	639	dst->activate ();
646	dst->speed_left -= rndm ();
647
648	dst->set_speed (dst->speed);
649	}	640	}
650		641
651	void	642	void
652	object::instantiate ()	643	object::instantiate ()
653	{	644	{
654	if (!uuid.seq) // HACK	645	if (!uuid.seq) // HACK
655	uuid = UUID::gen ();	646	uuid = UUID::gen ();
656		647
		648	// TODO: unclean state changes, should nt be done in copy_to AND instantiate
		649	if (flag [FLAG_RANDOM_SPEED] && speed)
		650	speed_left = - speed - rndm (); // TODO animation
		651	else
657	speed_left = -0.1f;	652	speed_left = -1.;
		653
658	/* copy the body_info to the body_used - this is only really	654	/* copy the body_info to the body_used - this is only really
659	* need for monsters, but doesn't hurt to do it for everything.	655	* need for monsters, but doesn't hurt to do it for everything.
660	* by doing so, when a monster is created, it has good starting	656	* by doing so, when a monster is created, it has good starting
661	* values for the body_used info, so when items are created	657	* values for the body_used info, so when items are created
662	* for it, they can be properly equipped.	658	* for it, they can be properly equipped.
…		…
670	object *	666	object *
671	object::clone ()	667	object::clone ()
672	{	668	{
673	object *neu = create ();	669	object *neu = create ();
674	copy_to (neu);	670	copy_to (neu);
		671
		672	// TODO: unclean state changes, should not be done in clone AND instantiate
		673	if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
		674	neu->speed_left = - neu->speed - rndm (); // TODO animation
		675
675	neu->map = map; // not copied by copy_to	676	neu->map = map; // not copied by copy_to
676	return neu;	677	return neu;
677	}	678	}
678		679
679	/*	680	/*
…		…
697	* This function needs to be called whenever the speed of an object changes.	698	* This function needs to be called whenever the speed of an object changes.
698	*/	699	*/
699	void	700	void
700	object::set_speed (float speed)	701	object::set_speed (float speed)
701	{	702	{
702	if (flag [FLAG_FREED] && speed)
703	{
704	LOG (llevError, "Object %s is freed but has speed.\n", &name);
705	speed = 0;
706	}
707
708	this->speed = speed;	703	this->speed = speed;
709		704
710	if (has_active_speed ())	705	if (has_active_speed ())
711	activate ();	706	activate ();
712	else	707	else
…		…
762		757
763	if (!(m.flags_ & P_UPTODATE))	758	if (!(m.flags_ & P_UPTODATE))
764	/* nop */;	759	/* nop */;
765	else if (action == UP_OBJ_INSERT)	760	else if (action == UP_OBJ_INSERT)
766	{	761	{
		762	#if 0
767	// this is likely overkill, TODO: revisit (schmorp)	763	// this is likely overkill, TODO: revisit (schmorp)
768	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	764	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
769	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	765	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
770	\|\| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	766	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
771	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	767	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
772	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	768	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
773	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	769	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
774	\|\| (m.move_on \| op->move_on ) != m.move_on	770	\|\| (m.move_on \| op->move_on ) != m.move_on
775	\|\| (m.move_off \| op->move_off ) != m.move_off	771	\|\| (m.move_off \| op->move_off ) != m.move_off
776	\|\| (m.move_slow \| op->move_slow) != m.move_slow	772	\|\| (m.move_slow \| op->move_slow) != m.move_slow
777	/* This isn't perfect, but I don't expect a lot of objects to	773	/* This isn't perfect, but I don't expect a lot of objects to
778	* to have move_allow right now.	774	* have move_allow right now.
779	*/	775	*/
780	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	776	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
		777	m.invalidate ();
		778	#else
781	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	779	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
782	m.flags_ = 0;	780	m.invalidate ();
		781	#endif
783	}	782	}
784	/* if the object is being removed, we can't make intelligent	783	/* if the object is being removed, we can't make intelligent
785	* decisions, because remove_ob can't really pass the object	784	* decisions, because remove_ob can't really pass the object
786	* that is being removed.	785	* that is being removed.
787	*/	786	*/
788	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	787	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
789	m.flags_ = 0;	788	m.invalidate ();
790	else if (action == UP_OBJ_FACE)	789	else if (action == UP_OBJ_FACE)
791	/* Nothing to do for that case */ ;	790	/* Nothing to do for that case */ ;
792	else	791	else
793	LOG (llevError, "update_object called with invalid action: %d\n", action);	792	LOG (llevError, "update_object called with invalid action: %d\n", action);
794		793
…		…
798		797
799	object::object ()	798	object::object ()
800	{	799	{
801	SET_FLAG (this, FLAG_REMOVED);	800	SET_FLAG (this, FLAG_REMOVED);
802		801
803	expmul = 1.0;	802	//expmul = 1.0; declared const for the time being
804	face = blank_face;	803	face = blank_face;
		804	material = MATERIAL_NULL;
805	}	805	}
806		806
807	object::~object ()	807	object::~object ()
808	{	808	{
809	unlink ();	809	unlink ();
…		…
838	/* If already on active list, don't do anything */	838	/* If already on active list, don't do anything */
839	if (active)	839	if (active)
840	return;	840	return;
841		841
842	if (has_active_speed ())	842	if (has_active_speed ())
		843	{
		844	if (flag [FLAG_FREED])
		845	LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		846
843	actives.insert (this);	847	actives.insert (this);
		848	}
844	}	849	}
845		850
846	void	851	void
847	object::activate_recursive ()	852	object::activate_recursive ()
848	{	853	{
…		…
913	\|\| map->in_memory != MAP_ACTIVE	918	\|\| map->in_memory != MAP_ACTIVE
914	\|\| map->no_drop	919	\|\| map->no_drop
915	\|\| ms ().move_block == MOVE_ALL)	920	\|\| ms ().move_block == MOVE_ALL)
916	{	921	{
917	while (inv)	922	while (inv)
918	{
919	inv->destroy_inv (false);
920	inv->destroy ();	923	inv->destroy ();
921	}
922	}	924	}
923	else	925	else
924	{ /* Put objects in inventory onto this space */	926	{ /* Put objects in inventory onto this space */
925	while (inv)	927	while (inv)
926	{	928	{
…		…
930	\|\| op->flag [FLAG_NO_DROP]	932	\|\| op->flag [FLAG_NO_DROP]
931	\|\| op->type == RUNE	933	\|\| op->type == RUNE
932	\|\| op->type == TRAP	934	\|\| op->type == TRAP
933	\|\| op->flag [FLAG_IS_A_TEMPLATE]	935	\|\| op->flag [FLAG_IS_A_TEMPLATE]
934	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	936	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
935	op->destroy (true);	937	op->destroy ();
936	else	938	else
937	map->insert (op, x, y);	939	map->insert (op, x, y);
938	}	940	}
		941	}
		942	}
		943
		944	/*
		945	* Remove and free all objects in the inventory of the given object.
		946	* Unlike destroy_inv, this assumes the *this is destroyed as well
		947	* well, so we can (and have to!) take shortcuts.
		948	*/
		949	void
		950	object::destroy_inv_fast ()
		951	{
		952	while (object *op = inv)
		953	{
		954	// remove from object the fast way
		955	op->flag [FLAG_REMOVED] = true;
		956	op->env = 0;
		957	if ((inv = inv->below))
		958	inv->above = 0;
		959
		960	// then destroy
		961	op->destroy ();
939	}	962	}
940	}	963	}
941		964
942	object *object::create ()	965	object *object::create ()
943	{	966	{
…		…
969		992
970	void	993	void
971	object::do_destroy ()	994	object::do_destroy ()
972	{	995	{
973	if (flag [FLAG_IS_LINKED])	996	if (flag [FLAG_IS_LINKED])
974	remove_button_link (this);	997	remove_link ();
975		998
976	if (flag [FLAG_FRIENDLY])	999	if (flag [FLAG_FRIENDLY])
977	remove_friendly_object (this);	1000	remove_friendly_object (this);
978		1001
979	remove ();	1002	remove ();
…		…
1004	attacked_by = 0;	1027	attacked_by = 0;
1005	current_weapon = 0;	1028	current_weapon = 0;
1006	}	1029	}
1007		1030
1008	void	1031	void
1009	object::destroy (bool destroy_inventory)	1032	object::destroy ()
1010	{	1033	{
1011	if (destroyed ())	1034	if (destroyed ())
1012	return;	1035	return;
1013		1036
1014	if (!is_head () && !head->destroyed ())	1037	if (!is_head () && !head->destroyed ())
1015	{	1038	{
1016	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1039	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1017	head->destroy (destroy_inventory);	1040	head->destroy ();
1018	return;	1041	return;
1019	}	1042	}
1020		1043
1021	destroy_inv (!destroy_inventory);	1044	destroy_inv_fast ();
1022		1045
1023	if (is_head ())	1046	if (is_head ())
1024	if (sound_destroy)	1047	if (sound_destroy)
1025	play_sound (sound_destroy);	1048	play_sound (sound_destroy);
1026	else if (flag [FLAG_MONSTER])	1049	else if (flag [FLAG_MONSTER])
…		…
1037	* the previous environment.	1060	* the previous environment.
1038	*/	1061	*/
1039	void	1062	void
1040	object::do_remove ()	1063	object::do_remove ()
1041	{	1064	{
1042	object tmp, last = 0;
1043	object *otmp;
1044
1045	if (flag [FLAG_REMOVED])	1065	if (flag [FLAG_REMOVED])
1046	return;	1066	return;
1047		1067
1048	INVOKE_OBJECT (REMOVE, this);	1068	INVOKE_OBJECT (REMOVE, this);
1049		1069
…		…
1062	if (object *pl = visible_to ())	1082	if (object *pl = visible_to ())
1063	esrv_del_item (pl->contr, count);	1083	esrv_del_item (pl->contr, count);
1064	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1084	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1065		1085
1066	adjust_weight (env, -total_weight ());	1086	adjust_weight (env, -total_weight ());
		1087
		1088	object *pl = in_player ();
1067		1089
1068	/* we set up values so that it could be inserted into	1090	/* we set up values so that it could be inserted into
1069	* the map, but we don't actually do that - it is up	1091	* the map, but we don't actually do that - it is up
1070	* to the caller to decide what we want to do.	1092	* to the caller to decide what we want to do.
1071	*/	1093	*/
…		…
1079		1101
1080	above = 0;	1102	above = 0;
1081	below = 0;	1103	below = 0;
1082	env = 0;	1104	env = 0;
1083		1105
1084	/* NO_FIX_PLAYER is set when a great many changes are being	1106	if (pl && pl->is_player ())
1085	* made to players inventory. If set, avoiding the call
1086	* to save cpu time.
1087	*/	1107	{
1088	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1108	if (expect_false (pl->contr->combat_ob == this))
1089	otmp->update_stats ();	1109	{
		1110	pl->apply (pl->contr->combat_ob, AP_UNAPPLY);
		1111	pl->contr->combat_ob = 0;
		1112	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
		1113	}
		1114
		1115	if (expect_false (pl->contr->ranged_ob == this))
		1116	{
		1117	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY);
		1118	pl->contr->ranged_ob = 0;
		1119	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
		1120	}
		1121
		1122	pl->contr->queue_stats_update ();
		1123
		1124	if (expect_false (glow_radius) && pl->is_on_map ())
		1125	update_all_los (pl->map, pl->x, pl->y);
		1126	}
1090	}	1127	}
1091	else if (map)	1128	else if (map)
1092	{	1129	{
1093	map->dirty = true;	1130	map->dirty = true;
1094	mapspace &ms = this->ms ();	1131	mapspace &ms = this->ms ();
1095		1132
1096	if (object *pl = ms.player ())	1133	if (object *pl = ms.player ())
1097	{	1134	{
1098	if (type == PLAYER) // this == pl(!)	1135	if (is_player ())
1099	{	1136	{
		1137	if (!flag [FLAG_WIZPASS])
		1138	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1139
1100	// leaving a spot always closes any open container on the ground	1140	// leaving a spot always closes any open container on the ground
1101	if (container && !container->env)	1141	if (container && !container->env)
1102	// this causes spurious floorbox updates, but it ensures	1142	// this causes spurious floorbox updates, but it ensures
1103	// that the CLOSE event is being sent.	1143	// that the CLOSE event is being sent.
1104	close_container ();	1144	close_container ();
1105		1145
1106	--map->players;	1146	--map->players;
1107	map->touch ();	1147	map->touch ();
1108	}	1148	}
1109	else if (pl->container == this)	1149	else if (pl->container_ () == this)
1110	{	1150	{
1111	// removing a container should close it	1151	// removing a container should close it
1112	close_container ();	1152	close_container ();
1113	}	1153	}
1114		1154
…		…
1121	*(below ? &below->above : &ms.bot) = above;	1161	*(below ? &below->above : &ms.bot) = above;
1122		1162
1123	above = 0;	1163	above = 0;
1124	below = 0;	1164	below = 0;
1125		1165
		1166	ms.invalidate ();
		1167
1126	if (map->in_memory == MAP_SAVING)	1168	if (map->in_memory == MAP_SAVING)
1127	return;	1169	return;
1128		1170
1129	int check_walk_off = !flag [FLAG_NO_APPLY];	1171	int check_walk_off = !flag [FLAG_NO_APPLY];
1130		1172
1131	if (object *pl = ms.player ())	1173	if (object *pl = ms.player ())
1132	{	1174	{
1133	if (pl->container == this)	1175	if (pl->container_ () == this)
1134	/* If a container that the player is currently using somehow gets	1176	/* If a container that the player is currently using somehow gets
1135	* removed (most likely destroyed), update the player view	1177	* removed (most likely destroyed), update the player view
1136	* appropriately.	1178	* appropriately.
1137	*/	1179	*/
1138	pl->close_container ();	1180	pl->close_container ();
…		…
1142	//TODO: update floorbox to preserve ordering	1184	//TODO: update floorbox to preserve ordering
1143	if (pl->contr->ns)	1185	if (pl->contr->ns)
1144	pl->contr->ns->floorbox_update ();	1186	pl->contr->ns->floorbox_update ();
1145	}	1187	}
1146		1188
		1189	if (check_walk_off)
1147	for (tmp = ms.bot; tmp; tmp = tmp->above)	1190	for (object above, tmp = ms.bot; tmp; tmp = above)
1148	{	1191	{
		1192	above = tmp->above;
		1193
1149	/* No point updating the players look faces if he is the object	1194	/* No point updating the players look faces if he is the object
1150	* being removed.	1195	* being removed.
1151	*/	1196	*/
1152		1197
1153	/* See if object moving off should effect something */	1198	/* See if object moving off should effect something */
1154	if (check_walk_off
1155	&& ((move_type & tmp->move_off)	1199	if ((move_type & tmp->move_off)
1156	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1200	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1157	{
1158	move_apply (tmp, this, 0);	1201	move_apply (tmp, this, 0);
1159
1160	if (destroyed ())
1161	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1162	}	1202	}
1163		1203
1164	last = tmp;	1204	if (affects_los ())
1165	}
1166
1167	/* last == NULL if there are no objects on this space */
1168	//TODO: this makes little sense, why only update the topmost object?
1169	if (!last)
1170	map->at (x, y).flags_ = 0;
1171	else
1172	update_object (last, UP_OBJ_REMOVE);
1173
1174	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1175	update_all_los (map, x, y);	1205	update_all_los (map, x, y);
1176	}	1206	}
1177	}	1207	}
1178		1208
1179	/*	1209	/*
…		…
1203	esrv_update_item (UPD_NROF, pl, top);	1233	esrv_update_item (UPD_NROF, pl, top);
1204		1234
1205	op->weight = 0; // cancel the addition above	1235	op->weight = 0; // cancel the addition above
1206	op->carrying = 0; // must be 0 already	1236	op->carrying = 0; // must be 0 already
1207		1237
1208	op->destroy (1);	1238	op->destroy ();
1209		1239
1210	return top;	1240	return top;
1211	}	1241	}
1212		1242
1213	return 0;	1243	return 0;
…		…
1221		1251
1222	object *prev = this;	1252	object *prev = this;
1223		1253
1224	for (archetype at = (archetype )arch->more; at; at = (archetype *)at->more)	1254	for (archetype at = (archetype )arch->more; at; at = (archetype *)at->more)
1225	{	1255	{
1226	object *op = arch_to_object (at);	1256	object *op = at->instance ();
1227		1257
1228	op->name = name;	1258	op->name = name;
1229	op->name_pl = name_pl;	1259	op->name_pl = name_pl;
1230	op->title = title;	1260	op->title = title;
1231		1261
…		…
1269	* Passing 0 for flag gives proper default values, so flag really only needs	1299	* Passing 0 for flag gives proper default values, so flag really only needs
1270	* to be set if special handling is needed.	1300	* to be set if special handling is needed.
1271	*	1301	*
1272	* Return value:	1302	* Return value:
1273	* new object if 'op' was merged with other object	1303	* new object if 'op' was merged with other object
1274	* NULL if 'op' was destroyed	1304	* NULL if there was an error (destroyed, blocked etc.)
1275	* just 'op' otherwise	1305	* just 'op' otherwise
1276	*/	1306	*/
1277	object *	1307	object *
1278	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1308	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1279	{	1309	{
1280	if (op->is_on_map ())
1281	{
1282	LOG (llevError, "insert_ob_in_map called for object already on map");
1283	abort ();
1284	}
1285
1286	if (op->env)
1287	{
1288	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1289	op->remove ();	1310	op->remove ();
		1311
		1312	if (m == &freed_map)//D TODO: remove soon
		1313	{//D
		1314	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1290	}	1315	}//D
1291		1316
1292	/* Ideally, the caller figures this out. However, it complicates a lot	1317	/* Ideally, the caller figures this out. However, it complicates a lot
1293	* of areas of callers (eg, anything that uses find_free_spot would now	1318	* of areas of callers (eg, anything that uses find_free_spot would now
1294	* need extra work	1319	* need extra work
1295	*/	1320	*/
		1321	maptile *newmap = m;
1296	if (!xy_normalise (m, op->x, op->y))	1322	if (!xy_normalise (newmap, op->x, op->y))
1297	{	1323	{
1298	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1324	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1299	return 0;	1325	return 0;
1300	}	1326	}
1301		1327
1302	if (object *more = op->more)	1328	if (object *more = op->more)
1303	if (!insert_ob_in_map (more, m, originator, flag))	1329	if (!insert_ob_in_map (more, m, originator, flag))
1304	return 0;	1330	return 0;
1305		1331
1306	CLEAR_FLAG (op, FLAG_REMOVED);	1332	op->flag [FLAG_REMOVED] = false;
1307		1333	op->env = 0;
1308	op->map = m;	1334	op->map = newmap;
		1335
1309	mapspace &ms = op->ms ();	1336	mapspace &ms = op->ms ();
1310		1337
1311	/* this has to be done after we translate the coordinates.	1338	/* this has to be done after we translate the coordinates.
1312	*/	1339	*/
1313	if (op->nrof && !(flag & INS_NO_MERGE))	1340	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1316	{	1343	{
1317	// TODO: we actually want to update tmp, not op,	1344	// TODO: we actually want to update tmp, not op,
1318	// but some caller surely breaks when we return tmp	1345	// but some caller surely breaks when we return tmp
1319	// from here :/	1346	// from here :/
1320	op->nrof += tmp->nrof;	1347	op->nrof += tmp->nrof;
1321	tmp->destroy (1);	1348	tmp->destroy ();
1322	}	1349	}
1323		1350
1324	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1351	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1325	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1352	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1326		1353
…		…
1334	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1361	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1335	abort ();	1362	abort ();
1336	}	1363	}
1337		1364
1338	if (!originator->is_on_map ())	1365	if (!originator->is_on_map ())
		1366	{
1339	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",	1367	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1340	op->debug_desc (), originator->debug_desc ());	1368	op->debug_desc (), originator->debug_desc ());
		1369	abort ();
		1370	}
1341		1371
1342	op->above = originator;	1372	op->above = originator;
1343	op->below = originator->below;	1373	op->below = originator->below;
1344	originator->below = op;	1374	originator->below = op;
1345		1375
…		…
1431	op->below = top;	1461	op->below = top;
1432	*(op->above ? &op->above->below : &ms.top) = op;	1462	*(op->above ? &op->above->below : &ms.top) = op;
1433	}	1463	}
1434	}	1464	}
1435		1465
1436	if (op->type == PLAYER)	1466	if (op->is_player ())
1437	{	1467	{
1438	op->contr->do_los = 1;	1468	op->contr->do_los = 1;
1439	++op->map->players;	1469	++op->map->players;
1440	op->map->touch ();	1470	op->map->touch ();
1441	}	1471	}
…		…
1456	* be far away from this change and not affected in any way -	1486	* be far away from this change and not affected in any way -
1457	* this should get redone to only look for players within range,	1487	* this should get redone to only look for players within range,
1458	* or just updating the P_UPTODATE for spaces within this area	1488	* or just updating the P_UPTODATE for spaces within this area
1459	* of effect may be sufficient.	1489	* of effect may be sufficient.
1460	*/	1490	*/
1461	if (op->map->darkness && (op->glow_radius != 0))	1491	if (op->affects_los ())
		1492	{
		1493	op->ms ().invalidate ();
1462	update_all_los (op->map, op->x, op->y);	1494	update_all_los (op->map, op->x, op->y);
		1495	}
1463		1496
1464	/* updates flags (blocked, alive, no magic, etc) for this map space */	1497	/* updates flags (blocked, alive, no magic, etc) for this map space */
1465	update_object (op, UP_OBJ_INSERT);	1498	update_object (op, UP_OBJ_INSERT);
1466		1499
1467	INVOKE_OBJECT (INSERT, op);	1500	INVOKE_OBJECT (INSERT, op);
…		…
1474	* blocked() and wall() work properly), and these flags are updated by	1507	* blocked() and wall() work properly), and these flags are updated by
1475	* update_object().	1508	* update_object().
1476	*/	1509	*/
1477		1510
1478	/* if this is not the head or flag has been passed, don't check walk on status */	1511	/* if this is not the head or flag has been passed, don't check walk on status */
1479	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1512	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1480	{	1513	{
1481	if (check_move_on (op, originator))	1514	if (check_move_on (op, originator))
1482	return 0;	1515	return 0;
1483		1516
1484	/* If we are a multi part object, lets work our way through the check	1517	/* If we are a multi part object, lets work our way through the check
…		…
1495	/* this function inserts an object in the map, but if it	1528	/* this function inserts an object in the map, but if it
1496	* finds an object of its own type, it'll remove that one first.	1529	* finds an object of its own type, it'll remove that one first.
1497	* op is the object to insert it under: supplies x and the map.	1530	* op is the object to insert it under: supplies x and the map.
1498	*/	1531	*/
1499	void	1532	void
1500	replace_insert_ob_in_map (const char arch_string, object op)	1533	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1501	{	1534	{
1502	/* first search for itself and remove any old instances */	1535	/* first search for itself and remove any old instances */
1503		1536
1504	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1537	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1505	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1538	if (tmp->arch->archname == archname) /* same archetype */
1506	tmp->destroy (1);	1539	tmp->destroy ();
1507		1540
1508	object *tmp = arch_to_object (archetype::find (arch_string));	1541	object *tmp = archetype::find (archname)->instance ();
1509		1542
1510	tmp->x = op->x;	1543	tmp->x = op->x;
1511	tmp->y = op->y;	1544	tmp->y = op->y;
1512		1545
1513	insert_ob_in_map (tmp, op->map, op, 0);	1546	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1518	{	1551	{
1519	if (where->env)	1552	if (where->env)
1520	return where->env->insert (this);	1553	return where->env->insert (this);
1521	else	1554	else
1522	return where->map->insert (this, where->x, where->y, originator, flags);	1555	return where->map->insert (this, where->x, where->y, originator, flags);
		1556	}
		1557
		1558	// check whether we can put this into the map, respect max_volume, max_items
		1559	bool
		1560	object::can_drop_at (maptile m, int x, int y, object originator)
		1561	{
		1562	mapspace &ms = m->at (x, y);
		1563
		1564	int items = ms.items ();
		1565
		1566	if (!items // testing !items ensures we can drop at least one item
		1567	\|\| (items < m->max_items
		1568	&& ms.volume () < m->max_volume))
		1569	return true;
		1570
		1571	if (originator && originator->is_player ())
		1572	originator->contr->failmsgf (
		1573	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1574	query_name ()
		1575	);
		1576
		1577	return false;
1523	}	1578	}
1524		1579
1525	/*	1580	/*
1526	* decrease(object, number) decreases a specified number from	1581	* decrease(object, number) decreases a specified number from
1527	* the amount of an object. If the amount reaches 0, the object	1582	* the amount of an object. If the amount reaches 0, the object
…		…
1535	if (!nr)	1590	if (!nr)
1536	return true;	1591	return true;
1537		1592
1538	nr = min (nr, nrof);	1593	nr = min (nr, nrof);
1539		1594
		1595	if (nrof > nr)
		1596	{
1540	nrof -= nr;	1597	nrof -= nr;
1541
1542	if (nrof)
1543	{
1544	adjust_weight (env, -weight * nr); // carrying == 0	1598	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1545		1599
1546	if (object *pl = visible_to ())	1600	if (object *pl = visible_to ())
1547	esrv_update_item (UPD_NROF, pl, this);	1601	esrv_update_item (UPD_NROF, pl, this);
1548		1602
1549	return true;	1603	return true;
1550	}	1604	}
1551	else	1605	else
1552	{	1606	{
1553	destroy (1);	1607	destroy ();
1554	return false;	1608	return false;
1555	}	1609	}
1556	}	1610	}
1557		1611
1558	/*	1612	/*
…		…
1635	if (object *pl = tmp->visible_to ())	1689	if (object *pl = tmp->visible_to ())
1636	esrv_update_item (UPD_NROF, pl, tmp);	1690	esrv_update_item (UPD_NROF, pl, tmp);
1637		1691
1638	adjust_weight (this, op->total_weight ());	1692	adjust_weight (this, op->total_weight ());
1639		1693
1640	op->destroy (1);	1694	op->destroy ();
1641	op = tmp;	1695	op = tmp;
1642	goto inserted;	1696	goto inserted;
1643	}	1697	}
1644		1698
1645	op->owner = 0; // it's his/hers now. period.	1699	op->owner = 0; // it's his/hers now. period.
…		…
1663		1717
1664	adjust_weight (this, op->total_weight ());	1718	adjust_weight (this, op->total_weight ());
1665		1719
1666	inserted:	1720	inserted:
1667	/* reset the light list and los of the players on the map */	1721	/* reset the light list and los of the players on the map */
1668	if (op->glow_radius && map && map->darkness)	1722	if (op->glow_radius && is_on_map ())
		1723	{
		1724	update_stats ();
1669	update_all_los (map, x, y);	1725	update_all_los (map, x, y);
1670		1726	}
		1727	else if (is_player ())
1671	// if this is a player's inventory, update stats	1728	// if this is a player's inventory, update stats
1672	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])	1729	contr->queue_stats_update ();
1673	update_stats ();
1674		1730
1675	INVOKE_OBJECT (INSERT, this);	1731	INVOKE_OBJECT (INSERT, this);
1676		1732
1677	return op;	1733	return op;
1678	}	1734	}
…		…
1698	* on top.	1754	* on top.
1699	*/	1755	*/
1700	int	1756	int
1701	check_move_on (object op, object originator)	1757	check_move_on (object op, object originator)
1702	{	1758	{
		1759	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1760	return 0;
		1761
1703	object *tmp;	1762	object *tmp;
1704	maptile *m = op->map;	1763	maptile *m = op->map;
1705	int x = op->x, y = op->y;	1764	int x = op->x, y = op->y;
1706		1765
1707	MoveType move_on, move_slow, move_block;	1766	mapspace &ms = m->at (x, y);
1708		1767
1709	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1768	ms.update ();
1710	return 0;
1711		1769
1712	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1770	MoveType move_on = ms.move_on;
1713	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1771	MoveType move_slow = ms.move_slow;
1714	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1772	MoveType move_block = ms.move_block;
1715		1773
1716	/* if nothing on this space will slow op down or be applied,	1774	/* if nothing on this space will slow op down or be applied,
1717	* no need to do checking below. have to make sure move_type	1775	* no need to do checking below. have to make sure move_type
1718	* is set, as lots of objects don't have it set - we treat that	1776	* is set, as lots of objects don't have it set - we treat that
1719	* as walking.	1777	* as walking.
…		…
1730	return 0;	1788	return 0;
1731		1789
1732	/* The objects have to be checked from top to bottom.	1790	/* The objects have to be checked from top to bottom.
1733	* Hence, we first go to the top:	1791	* Hence, we first go to the top:
1734	*/	1792	*/
1735		1793	for (object next, tmp = ms.top; tmp; tmp = next)
1736	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1737	{
1738	/* Trim the search when we find the first other spell effect
1739	* this helps performance so that if a space has 50 spell objects,
1740	* we don't need to check all of them.
1741	*/
1742	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1743	break;
1744	}	1794	{
		1795	next = tmp->below;
1745		1796
1746	for (; tmp; tmp = tmp->below)
1747	{
1748	if (tmp == op)	1797	if (tmp == op)
1749	continue; /* Can't apply yourself */	1798	continue; /* Can't apply yourself */
1750		1799
1751	/* Check to see if one of the movement types should be slowed down.	1800	/* Check to see if one of the movement types should be slowed down.
1752	* Second check makes sure that the movement types not being slowed	1801	* Second check makes sure that the movement types not being slowed
…		…
1757	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1806	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1758	{	1807	{
1759	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1808	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1760	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1809	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1761	{	1810	{
1762
1763	float
1764	diff = tmp->move_slow_penalty * fabs (op->speed);	1811	float diff = tmp->move_slow_penalty * fabs (op->speed);
1765		1812
1766	if (op->type == PLAYER)	1813	if (op->is_player ())
1767	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1814	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) \|\|
1768	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1815	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1769	diff /= 4.0;	1816	diff /= 4.0;
1770		1817
1771	op->speed_left -= diff;	1818	op->speed_left -= diff;
1772	}	1819	}
1773	}	1820	}
…		…
1979	* head of the object should correspond for the entire object.	2026	* head of the object should correspond for the entire object.
1980	*/	2027	*/
1981	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	2028	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1982	continue;	2029	continue;
1983		2030
1984	if (ob->blocked (m, pos.x, pos.y))	2031	if (ob->blocked (pos.m, pos.x, pos.y))
1985	continue;	2032	continue;
1986		2033
1987	altern [index++] = i;	2034	altern [index++] = i;
1988	}	2035	}
1989		2036
…		…
2057	* there is capable of.	2104	* there is capable of.
2058	*/	2105	*/
2059	int	2106	int
2060	find_dir (maptile m, int x, int y, object exclude)	2107	find_dir (maptile m, int x, int y, object exclude)
2061	{	2108	{
2062	int i, max = SIZEOFFREE, mflags;	2109	int max = SIZEOFFREE, mflags;
2063
2064	sint16 nx, ny;
2065	object *tmp;
2066	maptile *mp;
2067
2068	MoveType blocked, move_type;	2110	MoveType move_type;
2069		2111
2070	if (exclude && exclude->head_ () != exclude)	2112	if (exclude && exclude->head_ () != exclude)
2071	{	2113	{
2072	exclude = exclude->head;	2114	exclude = exclude->head;
2073	move_type = exclude->move_type;	2115	move_type = exclude->move_type;
…		…
2076	{	2118	{
2077	/* If we don't have anything, presume it can use all movement types. */	2119	/* If we don't have anything, presume it can use all movement types. */
2078	move_type = MOVE_ALL;	2120	move_type = MOVE_ALL;
2079	}	2121	}
2080		2122
2081	for (i = 1; i < max; i++)	2123	for (int i = 1; i < max; i++)
2082	{	2124	{
2083	mp = m;	2125	mapxy pos (m, x, y);
2084	nx = x + freearr_x[i];	2126	pos.move (i);
2085	ny = y + freearr_y[i];
2086		2127
2087	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2128	if (!pos.normalise ())
2088
2089	if (mflags & P_OUT_OF_MAP)
2090	max = maxfree[i];	2129	max = maxfree[i];
2091	else	2130	else
2092	{	2131	{
2093	mapspace &ms = mp->at (nx, ny);	2132	mapspace &ms = *pos;
2094		2133
2095	blocked = ms.move_block;
2096
2097	if ((move_type & blocked) == move_type)	2134	if ((move_type & ms.move_block) == move_type)
2098	max = maxfree[i];	2135	max = maxfree [i];
2099	else if (mflags & P_IS_ALIVE)	2136	else if (ms.flags () & P_IS_ALIVE)
2100	{	2137	{
2101	for (tmp = ms.bot; tmp; tmp = tmp->above)	2138	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2102	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2139	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2103	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2140	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2104	break;
2105
2106	if (tmp)
2107	return freedir[i];	2141	return freedir [i];
2108	}	2142	}
2109	}	2143	}
2110	}	2144	}
2111		2145
2112	return 0;	2146	return 0;
…		…
2187	* This basically means that if direction is 15, then it could either go	2221	* This basically means that if direction is 15, then it could either go
2188	* direction 4, 14, or 16 to get back to where we are.	2222	* direction 4, 14, or 16 to get back to where we are.
2189	* Moved from spell_util.c to object.c with the other related direction	2223	* Moved from spell_util.c to object.c with the other related direction
2190	* functions.	2224	* functions.
2191	*/	2225	*/
2192	int reduction_dir[SIZEOFFREE][3] = {	2226	static const int reduction_dir[SIZEOFFREE][3] = {
2193	{0, 0, 0}, /* 0 */	2227	{0, 0, 0}, /* 0 */
2194	{0, 0, 0}, /* 1 */	2228	{0, 0, 0}, /* 1 */
2195	{0, 0, 0}, /* 2 */	2229	{0, 0, 0}, /* 2 */
2196	{0, 0, 0}, /* 3 */	2230	{0, 0, 0}, /* 3 */
2197	{0, 0, 0}, /* 4 */	2231	{0, 0, 0}, /* 4 */
…		…
2293	int	2327	int
2294	can_pick (const object who, const object item)	2328	can_pick (const object who, const object item)
2295	{	2329	{
2296	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2330	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2297	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2331	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2298	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER \|\| item->weight < who->weight / 3));	2332	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2299	}	2333	}
2300		2334
2301	/*	2335	/*
2302	* create clone from object to another	2336	* create clone from object to another
2303	*/	2337	*/
…		…
2335	return tmp;	2369	return tmp;
2336		2370
2337	return 0;	2371	return 0;
2338	}	2372	}
2339		2373
2340	const shstr &	2374	shstr_tmp
2341	object::kv_get (const shstr &key) const	2375	object::kv_get (shstr_tmp key) const
2342	{	2376	{
2343	for (key_value *kv = key_values; kv; kv = kv->next)	2377	for (key_value *kv = key_values; kv; kv = kv->next)
2344	if (kv->key == key)	2378	if (kv->key == key)
2345	return kv->value;	2379	return kv->value;
2346		2380
2347	return shstr_null;	2381	return shstr ();
2348	}	2382	}
2349		2383
2350	void	2384	void
2351	object::kv_set (const shstr &key, const shstr &value)	2385	object::kv_set (shstr_tmp key, shstr_tmp value)
2352	{	2386	{
2353	for (key_value *kv = key_values; kv; kv = kv->next)	2387	for (key_value *kv = key_values; kv; kv = kv->next)
2354	if (kv->key == key)	2388	if (kv->key == key)
2355	{	2389	{
2356	kv->value = value;	2390	kv->value = value;
…		…
2365		2399
2366	key_values = kv;	2400	key_values = kv;
2367	}	2401	}
2368		2402
2369	void	2403	void
2370	object::kv_del (const shstr &key)	2404	object::kv_del (shstr_tmp key)
2371	{	2405	{
2372	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2406	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
2373	if ((*kvp)->key == key)	2407	if ((*kvp)->key == key)
2374	{	2408	{
2375	key_value kv = kvp;	2409	key_value kv = kvp;
…		…
2468	{	2502	{
2469	return map ? map->region (x, y)	2503	return map ? map->region (x, y)
2470	: region::default_region ();	2504	: region::default_region ();
2471	}	2505	}
2472		2506
2473	const materialtype_t *
2474	object::dominant_material () const
2475	{
2476	if (materialtype_t *mt = name_to_material (materialname))
2477	return mt;
2478
2479	return name_to_material (shstr_unknown);
2480	}
2481
2482	void	2507	void
2483	object::open_container (object *new_container)	2508	object::open_container (object *new_container)
2484	{	2509	{
2485	if (container == new_container)	2510	if (container == new_container)
2486	return;	2511	return;
…		…
2506	container = 0;	2531	container = 0;
2507		2532
2508	// client needs item update to make it work, client bug requires this to be separate	2533	// client needs item update to make it work, client bug requires this to be separate
2509	esrv_update_item (UPD_FLAGS, this, old_container);	2534	esrv_update_item (UPD_FLAGS, this, old_container);
2510		2535
2511	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2536	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2512	play_sound (sound_find ("chest_close"));	2537	play_sound (sound_find ("chest_close"));
2513	}	2538	}
2514		2539
2515	if (new_container)	2540	if (new_container)
2516	{	2541	{
…		…
2520	// TODO: this does not seem to serve any purpose anymore?	2545	// TODO: this does not seem to serve any purpose anymore?
2521	#if 0	2546	#if 0
2522	// insert the "Close Container" object.	2547	// insert the "Close Container" object.
2523	if (archetype *closer = new_container->other_arch)	2548	if (archetype *closer = new_container->other_arch)
2524	{	2549	{
2525	object *closer = arch_to_object (new_container->other_arch);	2550	object *closer = new_container->other_arch->instance ();
2526	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2551	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2527	new_container->insert (closer);	2552	new_container->insert (closer);
2528	}	2553	}
2529	#endif	2554	#endif
2530		2555
2531	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2556	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2532		2557
2533	// make sure the container is available, client bug requires this to be separate	2558	// make sure the container is available, client bug requires this to be separate
2534	esrv_send_item (this, new_container);	2559	esrv_send_item (this, new_container);
2535		2560
2536	new_container->flag [FLAG_APPLIED] = true;	2561	new_container->flag [FLAG_APPLIED] = true;
…		…
2544	// else if (!old_container->env && contr && contr->ns)	2569	// else if (!old_container->env && contr && contr->ns)
2545	// contr->ns->floorbox_reset ();	2570	// contr->ns->floorbox_reset ();
2546	}	2571	}
2547		2572
2548	object *	2573	object *
2549	object::force_find (const shstr name)	2574	object::force_find (shstr_tmp name)
2550	{	2575	{
2551	/* cycle through his inventory to look for the MARK we want to	2576	/* cycle through his inventory to look for the MARK we want to
2552	* place	2577	* place
2553	*/	2578	*/
2554	for (object *tmp = inv; tmp; tmp = tmp->below)	2579	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2556	return splay (tmp);	2581	return splay (tmp);
2557		2582
2558	return 0;	2583	return 0;
2559	}	2584	}
2560		2585
		2586	//-GPL
		2587
2561	void	2588	void
		2589	object::force_set_timer (int duration)
		2590	{
		2591	this->duration = 1;
		2592	this->speed_left = -1.f;
		2593
		2594	this->set_speed (duration ? 1.f / duration : 0.f);
		2595	}
		2596
		2597	object *
2562	object::force_add (const shstr name, int duration)	2598	object::force_add (shstr_tmp name, int duration)
2563	{	2599	{
2564	if (object *force = force_find (name))	2600	if (object *force = force_find (name))
2565	force->destroy ();	2601	force->destroy ();
2566		2602
2567	object *force = get_archetype (FORCE_NAME);	2603	object *force = get_archetype (FORCE_NAME);
2568		2604
2569	force->slaying = name;	2605	force->slaying = name;
2570	force->stats.food = 1;	2606	force->force_set_timer (duration);
2571	force->speed_left = -1.f;
2572
2573	force->set_speed (duration ? 1.f / duration : 0.f);
2574	force->flag [FLAG_IS_USED_UP] = true;
2575	force->flag [FLAG_APPLIED] = true;	2607	force->flag [FLAG_APPLIED] = true;
2576		2608
2577	insert (force);	2609	return insert (force);
2578	}	2610	}
2579		2611
2580	void	2612	void
2581	object::play_sound (faceidx sound)	2613	object::play_sound (faceidx sound) const
2582	{	2614	{
2583	if (!sound)	2615	if (!sound)
2584	return;	2616	return;
2585		2617
2586	if (flag [FLAG_REMOVED])	2618	if (is_on_map ())
		2619	map->play_sound (sound, x, y);
		2620	else if (object *pl = in_player ())
		2621	pl->contr->play_sound (sound);
		2622	}
		2623
		2624	void
		2625	object::say_msg (const char *msg) const
		2626	{
		2627	if (is_on_map ())
		2628	map->say_msg (msg, x, y);
		2629	else if (object *pl = in_player ())
		2630	pl->contr->play_sound (sound);
		2631	}
		2632
		2633	void
		2634	object::make_noise ()
		2635	{
		2636	// we do not model noise in the map, so instead put
		2637	// a temporary light into the noise source
		2638	// could use the map instead, but that's less reliable for our
		2639	// goal, which is to make invisibility a bit harder to exploit
		2640
		2641	// currently only works sensibly for players
		2642	if (!is_player ())
2587	return;	2643	return;
2588		2644
2589	if (env)	2645	// find old force, or create new one
2590	{	2646	object *force = force_find (shstr_noise_force);
2591	if (object *pl = in_player ())	2647
2592	pl->contr->play_sound (sound);	2648	if (force)
2593	}	2649	force->speed_left = -1.f; // patch old speed up
2594	else	2650	else
2595	map->play_sound (sound, x, y);	2651	{
2596	}	2652	force = archetype::get (shstr_noise_force);
2597		2653
		2654	force->slaying = shstr_noise_force;
		2655	force->stats.food = 1;
		2656	force->speed_left = -1.f;
		2657
		2658	force->set_speed (1.f / 4.f);
		2659	force->flag [FLAG_IS_USED_UP] = true;
		2660	force->flag [FLAG_APPLIED] = true;
		2661
		2662	insert (force);
		2663	}
		2664	}
		2665
		2666	void object::change_move_type (MoveType mt)
		2667	{
		2668	if (move_type == mt)
		2669	return;
		2670
		2671	if (is_on_map ())
		2672	{
		2673	// we are on the map, so handle move_on/off effects
		2674	remove ();
		2675	move_type = mt;
		2676	map->insert (this, x, y, this);
		2677	}
		2678	else
		2679	move_type = mt;
		2680	}
		2681

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.244 by root, Sun May 18 17:52:53 2008 UTC vs. Revision 1.321 by root, Sat Apr 10 04:54:09 2010 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.244 by root, Sun May 18 17:52:53 2008 UTC vs.
Revision 1.321 by root, Sat Apr 10 04:54:09 2010 UTC