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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.292 by root, Mon Oct 19 21:48:49 2009 UTC vs.
Revision 1.324 by root, Mon Apr 12 05:22:37 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,2009 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 it under	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* the terms of the Affero GNU General Public License as published by the	9	* the terms of the Affero GNU General Public License as published by the
10	* Free Software Foundation, either version 3 of the License, or (at your	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* option) any later version.	11	* option) any later version.
26	#include <stdio.h>	26	#include <stdio.h>
27	#include <sys/types.h>	27	#include <sys/types.h>
28	#include <sys/uio.h>	28	#include <sys/uio.h>
29	#include <object.h>	29	#include <object.h>
30	#include <sproto.h>	30	#include <sproto.h>
31	#include <loader.h>
32		31
33	#include <bitset>	32	#include <bitset>
34		33
35	UUID UUID::cur;	34	UUID UUID::cur;
36	static uint64_t seq_next_save;	35	static uint64_t seq_next_save;
37	static const uint64 UUID_GAP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
38	uint32_t mapspace::smellcount = 10000;	37	uint32_t mapspace::smellcount = 10000;
39		38
40	objectvec objects;	39	objectvec objects;
41	activevec actives;	40	activevec actives;
		41
		42	freelist_item *object::freelist;
		43	uint32_t object::object_count;
		44	uint32_t object::free_count;
		45	uint32_t object::create_count;
		46	uint32_t object::destroy_count;
		47
		48	//+GPL
42		49
43	short freearr_x[SIZEOFFREE] = {	50	short freearr_x[SIZEOFFREE] = {
44	0,	51	0,
45	0, 1, 1, 1, 0, -1, -1, -1,	52	0, 1, 1, 1, 0, -1, -1, -1,
46	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	53	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
…		…
50	0,	57	0,
51	-1, -1, 0, 1, 1, 1, 0, -1,	58	-1, -1, 0, 1, 1, 1, 0, -1,
52	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	59	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
53	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	60	-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	};	61	};
55	int maxfree[SIZEOFFREE] = {
56	0,
57	9, 10, 13, 14, 17, 18, 21, 22,
58	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
59	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
60	};
61	int freedir[SIZEOFFREE] = {	62	int freedir[SIZEOFFREE] = {
62	0,	63	0,
63	1, 2, 3, 4, 5, 6, 7, 8,	64	1, 2, 3, 4, 5, 6, 7, 8,
64	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	65	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
65	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	66	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
66	};	67	};
67		68
		69	static int maxfree[SIZEOFFREE] = {
		70	0,
		71	9, 10, 13, 14, 17, 18, 21, 22,
		72	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
		73	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
		74	};
		75
68	static void	76	static void
69	write_uuid (uval64 skip, bool sync)	77	write_uuid (uval64 skip, bool sync)
70	{	78	{
71	CALL_BEGIN (2);	79	CALL_BEGIN (2);
72	CALL_ARG_SV (newSVval64 (skip));	80	CALL_ARG_SV (newSVval64 (skip));
…		…
74	CALL_CALL ("cf::write_uuid", G_DISCARD);	82	CALL_CALL ("cf::write_uuid", G_DISCARD);
75	CALL_END;	83	CALL_END;
76	}	84	}
77		85
78	static void	86	static void
79	read_uuid (void)	87	read_uuid ()
80	{	88	{
81	char filename[MAX_BUF];	89	char filename[MAX_BUF];
82		90
83	sprintf (filename, "%s/uuid", settings.localdir);	91	sprintf (filename, "%s/uuid", settings.localdir);
84		92
…		…
98		106
99	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	107	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100	_exit (1);	108	_exit (1);
101	}	109	}
102		110
103	UUID::BUF buf;	111	char buf [UUID::MAX_LEN];
104	buf[0] = 0;	112	buf[0] = 0;
105	fgets (buf, sizeof (buf), fp);	113	fgets (buf, sizeof (buf), fp);
106		114
107	if (!UUID::cur.parse (buf))	115	if (!UUID::cur.parse (buf))
108	{	116	{
…		…
135		143
136	void	144	void
137	UUID::init ()	145	UUID::init ()
138	{	146	{
139	read_uuid ();	147	read_uuid ();
		148	}
		149
		150	bool
		151	UUID::parse (const char *s)
		152	{
		153	if (s++ != '<' \|\| s++ != '1' \|\| *s++ != '.')
		154	return false;
		155
		156	seq = 0;
		157
		158	while (*s != '>')
		159	{
		160	if (*s < '0')
		161	return false;
		162
		163	// this gives nice branchless code with gcc
		164	assert ('0' < 'a' && '0' == 48 && 'a' == 97);
		165	int digit = (s + (s & 0x40 ? 9 : 0)) & 15;
		166
		167	seq = (seq << 4) \| digit;
		168
		169	++s;
		170	}
		171
		172	return true;
		173	}
		174
		175	char *
		176	UUID::append (char *buf) const
		177	{
		178	*buf++ = '<';
		179	*buf++ = '1';
		180	*buf++ = '.';
		181
		182	uint64_t seq = this->seq;
		183	const int bits = 64;
		184	char nz = 0;
		185	static const char tohex [] = "0123456789abcdef";
		186
		187	// assert (len >= 3 + bits / 4 + 1 + 1);
		188	for (int i = bits / 4; --i; )
		189	{
		190	uint8_t digit = seq >> (bits - 4);
		191
		192	*buf = tohex [digit];
		193	nz \|= digit;
		194	buf += nz ? 1 : 0;
		195	seq <<= 4;
		196	}
		197
		198	// last digit is special - always emit
		199	uint8_t digit = seq >> (bits - 4);
		200	*buf++ = tohex [digit];
		201
		202	*buf++ = '>';
		203
		204	return buf;
		205	}
		206
		207	char *
		208	UUID::c_str () const
		209	{
		210	static char buf [MAX_LEN];
		211	*append (buf) = 0;
		212	return buf;
140	}	213	}
141		214
142	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	215	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
143	static bool	216	static bool
144	compare_ob_value_lists_one (const object wants, const object has)	217	compare_ob_value_lists_one (const object wants, const object has)
…		…
180	* Improvements made with merge: Better checking on potion, and also	253	* Improvements made with merge: Better checking on potion, and also
181	* check weight	254	* check weight
182	*/	255	*/
183	bool object::can_merge_slow (object ob1, object ob2)	256	bool object::can_merge_slow (object ob1, object ob2)
184	{	257	{
185	/* A couple quicksanity checks */	258	/* A couple quick sanity checks */
186	if (ob1 == ob2	259	if (ob1 == ob2
187	\|\| ob1->type != ob2->type	260	\|\| ob1->type != ob2->type
188	\|\| ob1->speed != ob2->speed
189	\|\| ob1->value != ob2->value	261	\|\| ob1->value != ob2->value
190	\|\| ob1->name != ob2->name)	262	\|\| ob1->name != ob2->name
		263	\|\| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
191	return 0;	264	return 0;
192		265
193	/* Do not merge objects if nrof would overflow, assume nrof	266	/* Do not merge objects if nrof would overflow, assume nrof
194	* is always 0 .. 2*31-1 /	267	* is always 0 .. 2*31-1 /
195	if (ob1->nrof > 0x7fffffff - ob2->nrof)	268	if (ob1->nrof > 0x7fffffff - ob2->nrof)
…		…
199	* This is to the comparison of the flags below will be OK. We	272	* This is to the comparison of the flags below will be OK. We
200	* just can't ignore the been applied or identified flags, as they	273	* just can't ignore the been applied or identified flags, as they
201	* are not equal - just if it has been identified, the been_applied	274	* are not equal - just if it has been identified, the been_applied
202	* flags lose any meaning.	275	* flags lose any meaning.
203	*/	276	*/
204	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	277	if (ob1->flag [FLAG_IDENTIFIED])
205	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	278	ob1->set_flag (FLAG_BEEN_APPLIED);
206		279
207	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	280	if (ob2->flag [FLAG_IDENTIFIED])
208	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	281	ob2->set_flag (FLAG_BEEN_APPLIED);
209		282
210	if (ob1->arch->archname != ob2->arch->archname	283	if (ob1->arch->archname != ob2->arch->archname
211	\|\| ob1->name != ob2->name	284	\|\| ob1->name != ob2->name
212	\|\| ob1->title != ob2->title	285	\|\| ob1->title != ob2->title
213	\|\| ob1->msg != ob2->msg	286	\|\| ob1->msg != ob2->msg
…		…
216	\|\| ob1->magic != ob2->magic	289	\|\| ob1->magic != ob2->magic
217	\|\| ob1->slaying != ob2->slaying	290	\|\| ob1->slaying != ob2->slaying
218	\|\| ob1->skill != ob2->skill	291	\|\| ob1->skill != ob2->skill
219	\|\| ob1->value != ob2->value	292	\|\| ob1->value != ob2->value
220	\|\| ob1->animation_id != ob2->animation_id	293	\|\| ob1->animation_id != ob2->animation_id
221	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other	294	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
222	\|\| ob1->client_type != ob2->client_type	295	\|\| ob1->client_type != ob2->client_type
223	\|\| ob1->materialname != ob2->materialname	296	\|\| ob1->material != ob2->material
224	\|\| ob1->lore != ob2->lore	297	\|\| ob1->lore != ob2->lore
225	\|\| ob1->subtype != ob2->subtype	298	\|\| ob1->subtype != ob2->subtype
226	\|\| ob1->move_type != ob2->move_type	299	\|\| ob1->move_type != ob2->move_type
227	\|\| ob1->move_block != ob2->move_block	300	\|\| ob1->move_block != ob2->move_block
228	\|\| ob1->move_allow != ob2->move_allow	301	\|\| ob1->move_allow != ob2->move_allow
229	\|\| ob1->move_on != ob2->move_on	302	\|\| ob1->move_on != ob2->move_on
230	\|\| ob1->move_off != ob2->move_off	303	\|\| ob1->move_off != ob2->move_off
231	\|\| ob1->move_slow != ob2->move_slow	304	\|\| ob1->move_slow != ob2->move_slow
232	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty	305	\|\| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
233	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	306	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
234	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	307	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
235	return 0;	308	return 0;
236		309
237	if ((ob1->flag ^ ob2->flag)	310	if ((ob1->flag ^ ob2->flag)
…		…
262		335
263	/* Don't merge objects that are applied. With the new 'body' code,	336	/* Don't merge objects that are applied. With the new 'body' code,
264	* it is possible for most any character to have more than one of	337	* it is possible for most any character to have more than one of
265	* some items equipped, and we don't want those to merge.	338	* some items equipped, and we don't want those to merge.
266	*/	339	*/
267	if (QUERY_FLAG (ob1, FLAG_APPLIED) \|\| QUERY_FLAG (ob2, FLAG_APPLIED))	340	if (ob1->flag [FLAG_APPLIED] \|\| ob2->flag [FLAG_APPLIED])
268	return 0;	341	return 0;
269		342
270	/* Note sure why the following is the case - either the object has to	343	/* Note sure why the following is the case - either the object has to
271	* be animated or have a very low speed. Is this an attempted monster	344	* be animated or have a very low speed. Is this an attempted monster
272	* check?	345	* check?
273	*/	346	*/
274	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())	347	if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
275	return 0;	348	return 0;
276		349
277	switch (ob1->type)	350	switch (ob1->type)
278	{	351	{
279	case SCROLL:	352	case SCROLL:
…		…
439	{	512	{
440	return dump_object (this);	513	return dump_object (this);
441	}	514	}
442		515
443	/*	516	/*
444	* get_nearest_part(multi-object, object 2) returns the part of the
445	* multi-object 1 which is closest to the second object.
446	* If it's not a multi-object, it is returned.
447	*/
448	object *
449	get_nearest_part (object op, const object pl)
450	{
451	object tmp, closest;
452	int last_dist, i;
453
454	if (!op->more)
455	return op;
456
457	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
458	tmp;
459	tmp = tmp->more)
460	if ((i = distance (tmp, pl)) < last_dist)
461	closest = tmp, last_dist = i;
462
463	return closest;
464	}
465
466	/*
467	* Returns the object which has the count-variable equal to the argument.	517	* Returns the object which has the count-variable equal to the argument.
468	* VERRRY slow.	518	* VERRRY slow.
469	*/	519	*/
470	object *	520	object *
471	find_object (tag_t i)	521	find_object (tag_t i)
472	{	522	{
473	for_all_objects (op)	523	for_all_objects (op)
474	if (op->count == i)	524	if (op->count == i)
		525	return op;
		526
		527	return 0;
		528	}
		529
		530	/*
		531	* Returns the object which has the uuid equal to the argument.
		532	* MOAR VERRRY slow.
		533	*/
		534
		535	object *
		536	find_object_uuid (UUID i)
		537	{
		538	for_all_objects (op)
		539	if (op->uuid == i)
475	return op;	540	return op;
476		541
477	return 0;	542	return 0;
478	}	543	}
479		544
…		…
513	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());	578	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
514	return;	579	return;
515	}	580	}
516		581
517	this->owner = owner;	582	this->owner = owner;
518	}
519
520	int
521	object::slottype () const
522	{
523	if (type == SKILL)
524	{
525	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
526	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
527	}
528	else
529	{
530	if (slot [body_combat].info) return slot_combat;
531	if (slot [body_range ].info) return slot_ranged;
532	}
533
534	return slot_none;
535	}
536
537	bool
538	object::change_weapon (object *ob)
539	{
540	if (current_weapon == ob)
541	return true;
542
543	if (chosen_skill)
544	chosen_skill->flag [FLAG_APPLIED] = false;
545
546	current_weapon = ob;
547	chosen_skill = !ob \|\| ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
548
549	if (chosen_skill)
550	chosen_skill->flag [FLAG_APPLIED] = true;
551
552	update_stats ();
553
554	if (ob)
555	{
556	// now check wether any body locations became invalid, in which case
557	// we cannot apply the weapon at the moment.
558	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
559	if (slot[i].used < 0)
560	{
561	current_weapon = chosen_skill = 0;
562	update_stats ();
563
564	new_draw_info_format (NDI_UNIQUE, 0, this,
565	"You try to balance all your items at once, "
566	"but the %s is just too much for your body. "
567	"[You need to unapply some items first - use the 'body' command to see "
568	"how many items you cna wera on a specific body part.]", &ob->name);
569	return false;
570	}
571
572	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
573	}
574	else
575	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
576
577	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
578	{
579	LOG (llevError \| logBacktrace, "%s changed to unapplied weapon %s",
580	&name, ob->debug_desc ());
581	return false;
582	}
583
584	return true;
585	}	583	}
586		584
587	/* Zero the key_values on op, decrementing the shared-string	585	/* Zero the key_values on op, decrementing the shared-string
588	* refcounts and freeing the links.	586	* refcounts and freeing the links.
589	*/	587	*/
…		…
642	tail = new_link;	640	tail = new_link;
643	}	641	}
644	}	642	}
645	}	643	}
646		644
647	if (speed < 0)
648	dst->speed_left -= rndm ();
649
650	dst->activate ();	645	dst->activate ();
651	}	646	}
652		647
653	void	648	void
654	object::instantiate ()	649	object::instantiate ()
655	{	650	{
656	if (!uuid.seq) // HACK	651	if (!uuid.seq) // HACK
657	uuid = UUID::gen ();	652	uuid = UUID::gen ();
658		653
		654	// TODO: unclean state changes, should nt be done in copy_to AND instantiate
		655	if (flag [FLAG_RANDOM_SPEED] && speed)
		656	speed_left = - speed - rndm (); // TODO animation
		657	else
659	speed_left = -0.1f;	658	speed_left = -1.;
		659
660	/* copy the body_info to the body_used - this is only really	660	/* copy the body_info to the body_used - this is only really
661	* need for monsters, but doesn't hurt to do it for everything.	661	* need for monsters, but doesn't hurt to do it for everything.
662	* by doing so, when a monster is created, it has good starting	662	* by doing so, when a monster is created, it has good starting
663	* values for the body_used info, so when items are created	663	* values for the body_used info, so when items are created
664	* for it, they can be properly equipped.	664	* for it, they can be properly equipped.
…		…
672	object *	672	object *
673	object::clone ()	673	object::clone ()
674	{	674	{
675	object *neu = create ();	675	object *neu = create ();
676	copy_to (neu);	676	copy_to (neu);
		677
		678	// TODO: unclean state changes, should not be done in clone AND instantiate
		679	if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
		680	neu->speed_left = - neu->speed - rndm (); // TODO animation
		681
677	neu->map = map; // not copied by copy_to	682	neu->map = map; // not copied by copy_to
678	return neu;	683	return neu;
679	}	684	}
680		685
681	/*	686	/*
…		…
684	* be called to update the face variable, _and_ how it looks on the map.	689	* be called to update the face variable, _and_ how it looks on the map.
685	*/	690	*/
686	void	691	void
687	update_turn_face (object *op)	692	update_turn_face (object *op)
688	{	693	{
689	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) \|\| !op->arch)	694	if (!op->flag [FLAG_IS_TURNABLE] \|\| !op->arch)
690	return;	695	return;
691		696
692	SET_ANIMATION (op, op->direction);	697	SET_ANIMATION (op, op->direction);
693	update_object (op, UP_OBJ_FACE);	698	update_object (op, UP_OBJ_FACE);
694	}	699	}
…		…
699	* This function needs to be called whenever the speed of an object changes.	704	* This function needs to be called whenever the speed of an object changes.
700	*/	705	*/
701	void	706	void
702	object::set_speed (float speed)	707	object::set_speed (float speed)
703	{	708	{
704	if (flag [FLAG_FREED] && speed)
705	{
706	LOG (llevError, "Object %s is freed but has speed.\n", &name);
707	speed = 0;
708	}
709
710	this->speed = speed;	709	this->speed = speed;
711		710
712	if (has_active_speed ())	711	if (has_active_speed ())
713	activate ();	712	activate ();
714	else	713	else
…		…
764		763
765	if (!(m.flags_ & P_UPTODATE))	764	if (!(m.flags_ & P_UPTODATE))
766	/* nop */;	765	/* nop */;
767	else if (action == UP_OBJ_INSERT)	766	else if (action == UP_OBJ_INSERT)
768	{	767	{
		768	#if 0
769	// this is likely overkill, TODO: revisit (schmorp)	769	// this is likely overkill, TODO: revisit (schmorp)
770	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	770	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
771	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	771	\|\| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
772	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))	772	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
773	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	773	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
774	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	774	\|\| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
775	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	775	\|\| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
776	\|\| (m.move_on \| op->move_on ) != m.move_on	776	\|\| (m.move_on \| op->move_on ) != m.move_on
777	\|\| (m.move_off \| op->move_off ) != m.move_off	777	\|\| (m.move_off \| op->move_off ) != m.move_off
778	\|\| (m.move_slow \| op->move_slow) != m.move_slow	778	\|\| (m.move_slow \| op->move_slow) != m.move_slow
779	/* This isn't perfect, but I don't expect a lot of objects to	779	/* This isn't perfect, but I don't expect a lot of objects to
780	* have move_allow right now.	780	* have move_allow right now.
781	*/	781	*/
782	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	782	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
783	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
784	m.invalidate ();	783	m.invalidate ();
		784	#else
		785	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
		786	m.invalidate ();
		787	#endif
785	}	788	}
786	/* if the object is being removed, we can't make intelligent	789	/* if the object is being removed, we can't make intelligent
787	* decisions, because remove_ob can't really pass the object	790	* decisions, because remove_ob can't really pass the object
788	* that is being removed.	791	* that is being removed.
789	*/	792	*/
…		…
798	update_object (op->more, action);	801	update_object (op->more, action);
799	}	802	}
800		803
801	object::object ()	804	object::object ()
802	{	805	{
803	SET_FLAG (this, FLAG_REMOVED);	806	this->set_flag (FLAG_REMOVED);
804		807
805	//expmul = 1.0; declared const for the time being	808	//expmul = 1.0; declared const for the time being
806	face = blank_face;	809	face = blank_face;
		810	material = MATERIAL_NULL;
807	}	811	}
808		812
809	object::~object ()	813	object::~object ()
810	{	814	{
811	unlink ();	815	unlink ();
812		816
813	free_key_values (this);	817	free_key_values (this);
814	}	818	}
815
816	static int object_count;
817		819
818	void object::link ()	820	void object::link ()
819	{	821	{
820	assert (!index);//D	822	assert (!index);//D
821	uuid = UUID::gen ();	823	uuid = UUID::gen ();
822	count = ++object_count;
823		824
824	refcnt_inc ();	825	refcnt_inc ();
825	objects.insert (this);	826	objects.insert (this);
		827
		828	++create_count;
		829
826	}	830	}
827		831
828	void object::unlink ()	832	void object::unlink ()
829	{	833	{
830	if (!index)	834	if (!index)
831	return;	835	return;
		836
		837	++destroy_count;
832		838
833	objects.erase (this);	839	objects.erase (this);
834	refcnt_dec ();	840	refcnt_dec ();
835	}	841	}
836		842
…		…
941	map->insert (op, x, y);	947	map->insert (op, x, y);
942	}	948	}
943	}	949	}
944	}	950	}
945		951
		952	/*
		953	* Remove and free all objects in the inventory of the given object.
		954	* Unlike destroy_inv, this assumes the *this is destroyed as well
		955	* well, so we can (and have to!) take shortcuts.
		956	*/
		957	void
		958	object::destroy_inv_fast ()
		959	{
		960	while (object *op = inv)
		961	{
		962	// remove from object the fast way
		963	op->flag [FLAG_REMOVED] = true;
		964	op->env = 0;
		965	if ((inv = inv->below))
		966	inv->above = 0;
		967
		968	// then destroy
		969	op->destroy ();
		970	}
		971	}
		972
		973	void
		974	object::freelist_free (int count)
		975	{
		976	while (count-- && freelist)
		977	{
		978	freelist_item *next = freelist->next;
		979	// count is being "destroyed"
		980
		981	sfree ((char *)freelist, sizeof (object));
		982
		983	freelist = next;
		984	--free_count;
		985	}
		986	}
		987
		988	object *
946	object *object::create ()	989	object::create ()
947	{	990	{
948	object *op = new object;	991	object *op;
		992
		993	if (freelist)
		994	{
		995	freelist_item li = *freelist;
		996	memset (freelist, 0, sizeof (object));
		997
		998	op = new (freelist) object;
		999	op->count = li.count;
		1000
		1001	freelist = li.next;
		1002	--free_count;
		1003	}
		1004	else
		1005	{
		1006	void *ni = salloc0<char> (sizeof (object));
		1007
		1008	op = new(ni) object;
		1009
		1010	op->count = ++object_count;
		1011	}
		1012
949	op->link ();	1013	op->link ();
		1014
950	return op;	1015	return op;
		1016	}
		1017
		1018	void
		1019	object::do_delete ()
		1020	{
		1021	uint32_t count = this->count;
		1022
		1023	this->~object ();
		1024
		1025	freelist_item li = (freelist_item )this;
		1026	li->next = freelist;
		1027	li->count = count;
		1028
		1029	freelist = li;
		1030	++free_count;
951	}	1031	}
952		1032
953	static struct freed_map : maptile	1033	static struct freed_map : maptile
954	{	1034	{
955	freed_map ()	1035	freed_map ()
…		…
1020	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1100	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1021	head->destroy ();	1101	head->destroy ();
1022	return;	1102	return;
1023	}	1103	}
1024		1104
1025	destroy_inv (false);	1105	destroy_inv_fast ();
1026		1106
1027	if (is_head ())	1107	if (is_head ())
1028	if (sound_destroy)	1108	if (sound_destroy)
1029	play_sound (sound_destroy);	1109	play_sound (sound_destroy);
1030	else if (flag [FLAG_MONSTER])	1110	else if (flag [FLAG_MONSTER])
…		…
1041	* the previous environment.	1121	* the previous environment.
1042	*/	1122	*/
1043	void	1123	void
1044	object::do_remove ()	1124	object::do_remove ()
1045	{	1125	{
1046	object tmp, last = 0;
1047	object *otmp;
1048
1049	if (flag [FLAG_REMOVED])	1126	if (flag [FLAG_REMOVED])
1050	return;	1127	return;
1051		1128
1052	INVOKE_OBJECT (REMOVE, this);	1129	INVOKE_OBJECT (REMOVE, this);
1053		1130
…		…
1085		1162
1086	above = 0;	1163	above = 0;
1087	below = 0;	1164	below = 0;
1088	env = 0;	1165	env = 0;
1089		1166
1090	/* NO_FIX_PLAYER is set when a great many changes are being	1167	if (pl && pl->is_player ())
1091	* made to players inventory. If set, avoiding the call
1092	* to save cpu time.
1093	*/	1168	{
1094	if (pl)	1169	if (expect_false (pl->contr->combat_ob == this))
1095	if (pl->is_player () && (glow_radius \|\| !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1096	{	1170	{
1097	pl->update_stats ();	1171	pl->apply (pl->contr->combat_ob, AP_UNAPPLY);
		1172	pl->contr->combat_ob = 0;
		1173	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
		1174	}
1098		1175
		1176	if (expect_false (pl->contr->ranged_ob == this))
		1177	{
		1178	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY);
		1179	pl->contr->ranged_ob = 0;
		1180	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
		1181	}
		1182
		1183	pl->contr->queue_stats_update ();
		1184
1099	if (glow_radius && pl->is_on_map ())	1185	if (expect_false (glow_radius) && pl->is_on_map ())
1100	update_all_los (pl->map, pl->x, pl->y);	1186	update_all_los (pl->map, pl->x, pl->y);
1101	}	1187	}
1102	}	1188	}
1103	else if (map)	1189	else if (map)
1104	{	1190	{
1105	map->dirty = true;	1191	map->dirty = true;
1106	mapspace &ms = this->ms ();	1192	mapspace &ms = this->ms ();
…		…
1124	else if (pl->container_ () == this)	1210	else if (pl->container_ () == this)
1125	{	1211	{
1126	// removing a container should close it	1212	// removing a container should close it
1127	close_container ();	1213	close_container ();
1128	}	1214	}
1129		1215	else
1130	esrv_del_item (pl->contr, count);	1216	esrv_del_item (pl->contr, count);
1131	}	1217	}
1132		1218
1133	/* link the object above us */	1219	/* link the object above us */
1134	// re-link, make sure compiler can easily use cmove	1220	// re-link, make sure compiler can easily use cmove
1135	*(above ? &above->below : &ms.top) = below;	1221	*(above ? &above->below : &ms.top) = below;
…		…
1159	//TODO: update floorbox to preserve ordering	1245	//TODO: update floorbox to preserve ordering
1160	if (pl->contr->ns)	1246	if (pl->contr->ns)
1161	pl->contr->ns->floorbox_update ();	1247	pl->contr->ns->floorbox_update ();
1162	}	1248	}
1163		1249
		1250	if (check_walk_off)
1164	for (tmp = ms.bot; tmp; tmp = tmp->above)	1251	for (object above, tmp = ms.bot; tmp; tmp = above)
1165	{	1252	{
		1253	above = tmp->above;
		1254
1166	/* No point updating the players look faces if he is the object	1255	/* No point updating the players look faces if he is the object
1167	* being removed.	1256	* being removed.
1168	*/	1257	*/
1169		1258
1170	/* See if object moving off should effect something */	1259	/* See if object moving off should effect something */
1171	if (check_walk_off
1172	&& ((move_type & tmp->move_off)	1260	if ((move_type & tmp->move_off)
1173	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1261	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1174	{
1175	move_apply (tmp, this, 0);	1262	move_apply (tmp, this, 0);
1176
1177	if (destroyed ())
1178	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1179	}	1263	}
1180
1181	last = tmp;
1182	}
1183		1264
1184	if (affects_los ())	1265	if (affects_los ())
1185	update_all_los (map, x, y);	1266	update_all_los (map, x, y);
1186	}	1267	}
1187	}	1268	}
…		…
1231		1312
1232	object *prev = this;	1313	object *prev = this;
1233		1314
1234	for (archetype at = (archetype )arch->more; at; at = (archetype *)at->more)	1315	for (archetype at = (archetype )arch->more; at; at = (archetype *)at->more)
1235	{	1316	{
1236	object *op = arch_to_object (at);	1317	object *op = at->instance ();
1237		1318
1238	op->name = name;	1319	op->name = name;
1239	op->name_pl = name_pl;	1320	op->name_pl = name_pl;
1240	op->title = title;	1321	op->title = title;
1241		1322
…		…
1279	* Passing 0 for flag gives proper default values, so flag really only needs	1360	* Passing 0 for flag gives proper default values, so flag really only needs
1280	* to be set if special handling is needed.	1361	* to be set if special handling is needed.
1281	*	1362	*
1282	* Return value:	1363	* Return value:
1283	* new object if 'op' was merged with other object	1364	* new object if 'op' was merged with other object
1284	* NULL if 'op' was destroyed	1365	* NULL if there was an error (destroyed, blocked etc.)
1285	* just 'op' otherwise	1366	* just 'op' otherwise
1286	*/	1367	*/
1287	object *	1368	object *
1288	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1369	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1289	{	1370	{
…		…
1326	// from here :/	1407	// from here :/
1327	op->nrof += tmp->nrof;	1408	op->nrof += tmp->nrof;
1328	tmp->destroy ();	1409	tmp->destroy ();
1329	}	1410	}
1330		1411
1331	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1412	op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1332	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1413	op->clr_flag (FLAG_INV_LOCKED);
1333		1414
1334	if (!QUERY_FLAG (op, FLAG_ALIVE))	1415	if (!op->flag [FLAG_ALIVE])
1335	CLEAR_FLAG (op, FLAG_NO_STEAL);	1416	op->clr_flag (FLAG_NO_STEAL);
1336		1417
1337	if (flag & INS_BELOW_ORIGINATOR)	1418	if (flag & INS_BELOW_ORIGINATOR)
1338	{	1419	{
1339	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y)	1420	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y)
1340	{	1421	{
…		…
1375	* when lots of spells are cast in one area. Currently, it is presumed	1456	* when lots of spells are cast in one area. Currently, it is presumed
1376	* that flying non pickable objects are spell objects.	1457	* that flying non pickable objects are spell objects.
1377	*/	1458	*/
1378	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1459	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1379	{	1460	{
1380	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))	1461	if (tmp->flag [FLAG_IS_FLOOR] \|\| tmp->flag [FLAG_OVERLAY_FLOOR])
1381	floor = tmp;	1462	floor = tmp;
1382		1463
1383	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1464	if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1384	{	1465	{
1385	/* We insert above top, so we want this object below this */	1466	/* We insert above top, so we want this object below this */
1386	top = tmp->below;	1467	top = tmp->below;
1387	break;	1468	break;
1388	}	1469	}
…		…
1406	&& (op->face && !faces [op->face].visibility))	1487	&& (op->face && !faces [op->face].visibility))
1407	{	1488	{
1408	object *last;	1489	object *last;
1409		1490
1410	for (last = top; last != floor; last = last->below)	1491	for (last = top; last != floor; last = last->below)
1411	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1492	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1412	break;	1493	break;
1413		1494
1414	/* Check to see if we found the object that blocks view,	1495	/* Check to see if we found the object that blocks view,
1415	* and make sure we have a below pointer for it so that	1496	* and make sure we have a below pointer for it so that
1416	* we can get inserted below this one, which requires we	1497	* we can get inserted below this one, which requires we
…		…
1516		1597
1517	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1598	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1518	if (tmp->arch->archname == archname) /* same archetype */	1599	if (tmp->arch->archname == archname) /* same archetype */
1519	tmp->destroy ();	1600	tmp->destroy ();
1520		1601
1521	object *tmp = arch_to_object (archetype::find (archname));	1602	object *tmp = archetype::find (archname)->instance ();
1522		1603
1523	tmp->x = op->x;	1604	tmp->x = op->x;
1524	tmp->y = op->y;	1605	tmp->y = op->y;
1525		1606
1526	insert_ob_in_map (tmp, op->map, op, 0);	1607	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1531	{	1612	{
1532	if (where->env)	1613	if (where->env)
1533	return where->env->insert (this);	1614	return where->env->insert (this);
1534	else	1615	else
1535	return where->map->insert (this, where->x, where->y, originator, flags);	1616	return where->map->insert (this, where->x, where->y, originator, flags);
		1617	}
		1618
		1619	// check whether we can put this into the map, respect max_volume, max_items
		1620	bool
		1621	object::can_drop_at (maptile m, int x, int y, object originator)
		1622	{
		1623	mapspace &ms = m->at (x, y);
		1624
		1625	int items = ms.items ();
		1626
		1627	if (!items // testing !items ensures we can drop at least one item
		1628	\|\| (items < m->max_items
		1629	&& ms.volume () < m->max_volume))
		1630	return true;
		1631
		1632	if (originator && originator->is_player ())
		1633	originator->contr->failmsgf (
		1634	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1635	query_name ()
		1636	);
		1637
		1638	return false;
1536	}	1639	}
1537		1640
1538	/*	1641	/*
1539	* decrease(object, number) decreases a specified number from	1642	* decrease(object, number) decreases a specified number from
1540	* the amount of an object. If the amount reaches 0, the object	1643	* the amount of an object. If the amount reaches 0, the object
…		…
1680	if (op->glow_radius && is_on_map ())	1783	if (op->glow_radius && is_on_map ())
1681	{	1784	{
1682	update_stats ();	1785	update_stats ();
1683	update_all_los (map, x, y);	1786	update_all_los (map, x, y);
1684	}	1787	}
1685	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])	1788	else if (is_player ())
1686	// if this is a player's inventory, update stats	1789	// if this is a player's inventory, update stats
1687	update_stats ();	1790	contr->queue_stats_update ();
1688		1791
1689	INVOKE_OBJECT (INSERT, this);	1792	INVOKE_OBJECT (INSERT, this);
1690		1793
1691	return op;	1794	return op;
1692	}	1795	}
…		…
1712	* on top.	1815	* on top.
1713	*/	1816	*/
1714	int	1817	int
1715	check_move_on (object op, object originator)	1818	check_move_on (object op, object originator)
1716	{	1819	{
1717	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1820	if (op->flag [FLAG_NO_APPLY])
1718	return 0;	1821	return 0;
1719		1822
1720	object *tmp;	1823	object *tmp;
1721	maptile *m = op->map;	1824	maptile *m = op->map;
1722	int x = op->x, y = op->y;	1825	int x = op->x, y = op->y;
…		…
1759	* Second check makes sure that the movement types not being slowed	1862	* Second check makes sure that the movement types not being slowed
1760	* (~slow_move) is not blocked on this space - just because the	1863	* (~slow_move) is not blocked on this space - just because the
1761	* space doesn't slow down swimming (for example), if you can't actually	1864	* space doesn't slow down swimming (for example), if you can't actually
1762	* swim on that space, can't use it to avoid the penalty.	1865	* swim on that space, can't use it to avoid the penalty.
1763	*/	1866	*/
1764	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1867	if (!op->flag [FLAG_WIZPASS])
1765	{	1868	{
1766	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1869	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1767	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1870	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1768	{	1871	{
1769	float diff = tmp->move_slow_penalty * fabs (op->speed);	1872	float diff = tmp->move_slow_penalty * fabs (op->speed);
…		…
1900	void	2003	void
1901	flag_inv (object *op, int flag)	2004	flag_inv (object *op, int flag)
1902	{	2005	{
1903	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2006	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1904	{	2007	{
1905	SET_FLAG (tmp, flag);	2008	tmp->set_flag (flag);
1906	flag_inv (tmp, flag);	2009	flag_inv (tmp, flag);
1907	}	2010	}
1908	}	2011	}
1909		2012
1910	/*	2013	/*
…		…
1913	void	2016	void
1914	unflag_inv (object *op, int flag)	2017	unflag_inv (object *op, int flag)
1915	{	2018	{
1916	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2019	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1917	{	2020	{
1918	CLEAR_FLAG (tmp, flag);	2021	tmp->clr_flag (flag);
1919	unflag_inv (tmp, flag);	2022	unflag_inv (tmp, flag);
1920	}	2023	}
1921	}	2024	}
1922		2025
1923	/*	2026	/*
…		…
2179	* This basically means that if direction is 15, then it could either go	2282	* This basically means that if direction is 15, then it could either go
2180	* direction 4, 14, or 16 to get back to where we are.	2283	* direction 4, 14, or 16 to get back to where we are.
2181	* Moved from spell_util.c to object.c with the other related direction	2284	* Moved from spell_util.c to object.c with the other related direction
2182	* functions.	2285	* functions.
2183	*/	2286	*/
2184	const int reduction_dir[SIZEOFFREE][3] = {	2287	static const int reduction_dir[SIZEOFFREE][3] = {
2185	{0, 0, 0}, /* 0 */	2288	{0, 0, 0}, /* 0 */
2186	{0, 0, 0}, /* 1 */	2289	{0, 0, 0}, /* 1 */
2187	{0, 0, 0}, /* 2 */	2290	{0, 0, 0}, /* 2 */
2188	{0, 0, 0}, /* 3 */	2291	{0, 0, 0}, /* 3 */
2189	{0, 0, 0}, /* 4 */	2292	{0, 0, 0}, /* 4 */
…		…
2283	* Add a check so we can't pick up invisible objects (0.93.8)	2386	* Add a check so we can't pick up invisible objects (0.93.8)
2284	*/	2387	*/
2285	int	2388	int
2286	can_pick (const object who, const object item)	2389	can_pick (const object who, const object item)
2287	{	2390	{
2288	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2391	return /who->flag [FLAG_WIZ]\|\| /
2289	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2392	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2290	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));	2393	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2291	}	2394	}
2292		2395
2293	/*	2396	/*
2294	* create clone from object to another	2397	* create clone from object to another
2295	*/	2398	*/
…		…
2460	{	2563	{
2461	return map ? map->region (x, y)	2564	return map ? map->region (x, y)
2462	: region::default_region ();	2565	: region::default_region ();
2463	}	2566	}
2464		2567
2465	const materialtype_t *
2466	object::dominant_material () const
2467	{
2468	if (materialtype_t *mt = name_to_material (materialname))
2469	return mt;
2470
2471	return name_to_material (shstr_unknown);
2472	}
2473
2474	void	2568	void
2475	object::open_container (object *new_container)	2569	object::open_container (object *new_container)
2476	{	2570	{
2477	if (container == new_container)	2571	if (container == new_container)
2478	return;	2572	return;
…		…
2512	// TODO: this does not seem to serve any purpose anymore?	2606	// TODO: this does not seem to serve any purpose anymore?
2513	#if 0	2607	#if 0
2514	// insert the "Close Container" object.	2608	// insert the "Close Container" object.
2515	if (archetype *closer = new_container->other_arch)	2609	if (archetype *closer = new_container->other_arch)
2516	{	2610	{
2517	object *closer = arch_to_object (new_container->other_arch);	2611	object *closer = new_container->other_arch->instance ();
2518	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2612	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2519	new_container->insert (closer);	2613	new_container->insert (closer);
2520	}	2614	}
2521	#endif	2615	#endif
2522		2616
…		…
2548	return splay (tmp);	2642	return splay (tmp);
2549		2643
2550	return 0;	2644	return 0;
2551	}	2645	}
2552		2646
		2647	//-GPL
		2648
2553	void	2649	void
2554	object::force_set_timer (int duration)	2650	object::force_set_timer (int duration)
2555	{	2651	{
2556	this->duration = 1;	2652	this->duration = 1;
2557	this->speed_left = -1.f;	2653	this->speed_left = -1.f;
…		…
2566	force->destroy ();	2662	force->destroy ();
2567		2663
2568	object *force = get_archetype (FORCE_NAME);	2664	object *force = get_archetype (FORCE_NAME);
2569		2665
2570	force->slaying = name;	2666	force->slaying = name;
2571
2572	force->force_set_timer (duration);	2667	force->force_set_timer (duration);
2573
2574	force->flag [FLAG_APPLIED] = true;	2668	force->flag [FLAG_APPLIED] = true;
2575		2669
2576	return insert (force);	2670	return insert (force);
2577	}	2671	}
2578		2672
2579	void	2673	void
…		…
2628		2722
2629	insert (force);	2723	insert (force);
2630	}	2724	}
2631	}	2725	}
2632		2726
		2727	void object::change_move_type (MoveType mt)
		2728	{
		2729	if (move_type == mt)
		2730	return;
		2731
		2732	if (is_on_map ())
		2733	{
		2734	// we are on the map, so handle move_on/off effects
		2735	remove ();
		2736	move_type = mt;
		2737	map->insert (this, x, y, this);
		2738	}
		2739	else
		2740	move_type = mt;
		2741	}
		2742

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.292 by root, Mon Oct 19 21:48:49 2009 UTC vs. Revision 1.324 by root, Mon Apr 12 05:22:37 2010 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.292 by root, Mon Oct 19 21:48:49 2009 UTC vs.
Revision 1.324 by root, Mon Apr 12 05:22:37 2010 UTC