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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.293 by root, Wed Oct 21 00:44:39 2009 UTC vs.
Revision 1.329 by root, Sun Apr 18 12:50:07 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:
…		…
410		483
411	sum = weight_adjust_for (this, sum);	484	sum = weight_adjust_for (this, sum);
412		485
413	if (sum != carrying)	486	if (sum != carrying)
414	{	487	{
		488	if (carrying != sum)//D
		489	LOG (llevDebug, "updating weight got %ld, expected %ld (%s)\n",
		490	(long long)sum, (long long)carrying, debug_desc ());
		491
415	carrying = sum;	492	carrying = sum;
416		493
417	if (object *pl = visible_to ())	494	if (object *pl = visible_to ())
418	if (pl != this) // player is handled lazily	495	if (pl != this) // player is handled lazily
419	esrv_update_item (UPD_WEIGHT, pl, this);	496	esrv_update_item (UPD_WEIGHT, pl, this);
…		…
439	{	516	{
440	return dump_object (this);	517	return dump_object (this);
441	}	518	}
442		519
443	/*	520	/*
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.	521	* Returns the object which has the count-variable equal to the argument.
468	* VERRRY slow.	522	* VERRRY slow.
469	*/	523	*/
470	object *	524	object *
471	find_object (tag_t i)	525	find_object (tag_t i)
472	{	526	{
473	for_all_objects (op)	527	for_all_objects (op)
474	if (op->count == i)	528	if (op->count == i)
		529	return op;
		530
		531	return 0;
		532	}
		533
		534	/*
		535	* Returns the object which has the uuid equal to the argument.
		536	* MOAR VERRRY slow.
		537	*/
		538
		539	object *
		540	find_object_uuid (UUID i)
		541	{
		542	for_all_objects (op)
		543	if (op->uuid == i)
475	return op;	544	return op;
476		545
477	return 0;	546	return 0;
478	}	547	}
479		548
…		…
513	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());	582	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
514	return;	583	return;
515	}	584	}
516		585
517	this->owner = owner;	586	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	}	587	}
586		588
587	/* Zero the key_values on op, decrementing the shared-string	589	/* Zero the key_values on op, decrementing the shared-string
588	* refcounts and freeing the links.	590	* refcounts and freeing the links.
589	*/	591	*/
…		…
642	tail = new_link;	644	tail = new_link;
643	}	645	}
644	}	646	}
645	}	647	}
646		648
647	if (speed < 0)
648	dst->speed_left -= rndm ();
649
650	dst->activate ();	649	dst->activate ();
651	}	650	}
652		651
653	void	652	void
654	object::instantiate ()	653	object::instantiate ()
655	{	654	{
656	if (!uuid.seq) // HACK	655	if (!uuid.seq) // HACK
657	uuid = UUID::gen ();	656	uuid = UUID::gen ();
658		657
		658	// TODO: unclean state changes, should nt be done in copy_to AND instantiate
		659	if (flag [FLAG_RANDOM_SPEED] && speed)
		660	speed_left = - speed - rndm (); // TODO animation
		661	else
659	speed_left = -0.1f;	662	speed_left = -1.;
		663
660	/* copy the body_info to the body_used - this is only really	664	/* 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.	665	* 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	666	* by doing so, when a monster is created, it has good starting
663	* values for the body_used info, so when items are created	667	* values for the body_used info, so when items are created
664	* for it, they can be properly equipped.	668	* for it, they can be properly equipped.
…		…
672	object *	676	object *
673	object::clone ()	677	object::clone ()
674	{	678	{
675	object *neu = create ();	679	object *neu = create ();
676	copy_to (neu);	680	copy_to (neu);
		681
		682	// TODO: unclean state changes, should not be done in clone AND instantiate
		683	if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
		684	neu->speed_left = - neu->speed - rndm (); // TODO animation
		685
677	neu->map = map; // not copied by copy_to	686	neu->map = map; // not copied by copy_to
678	return neu;	687	return neu;
679	}	688	}
680		689
681	/*	690	/*
…		…
684	* be called to update the face variable, _and_ how it looks on the map.	693	* be called to update the face variable, _and_ how it looks on the map.
685	*/	694	*/
686	void	695	void
687	update_turn_face (object *op)	696	update_turn_face (object *op)
688	{	697	{
689	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) \|\| !op->arch)	698	if (!op->flag [FLAG_IS_TURNABLE] \|\| !op->arch)
690	return;	699	return;
691		700
692	SET_ANIMATION (op, op->direction);	701	SET_ANIMATION (op, op->direction);
693	update_object (op, UP_OBJ_FACE);	702	update_object (op, UP_OBJ_FACE);
694	}	703	}
…		…
699	* This function needs to be called whenever the speed of an object changes.	708	* This function needs to be called whenever the speed of an object changes.
700	*/	709	*/
701	void	710	void
702	object::set_speed (float speed)	711	object::set_speed (float speed)
703	{	712	{
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;	713	this->speed = speed;
711		714
712	if (has_active_speed ())	715	if (has_active_speed ())
713	activate ();	716	activate ();
714	else	717	else
…		…
764		767
765	if (!(m.flags_ & P_UPTODATE))	768	if (!(m.flags_ & P_UPTODATE))
766	/* nop */;	769	/* nop */;
767	else if (action == UP_OBJ_INSERT)	770	else if (action == UP_OBJ_INSERT)
768	{	771	{
		772	#if 0
769	// this is likely overkill, TODO: revisit (schmorp)	773	// this is likely overkill, TODO: revisit (schmorp)
770	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	774	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
771	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	775	\|\| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
772	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))	776	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
773	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	777	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
774	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	778	\|\| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
775	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	779	\|\| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
776	\|\| (m.move_on \| op->move_on ) != m.move_on	780	\|\| (m.move_on \| op->move_on ) != m.move_on
777	\|\| (m.move_off \| op->move_off ) != m.move_off	781	\|\| (m.move_off \| op->move_off ) != m.move_off
778	\|\| (m.move_slow \| op->move_slow) != m.move_slow	782	\|\| (m.move_slow \| op->move_slow) != m.move_slow
779	/* This isn't perfect, but I don't expect a lot of objects to	783	/* This isn't perfect, but I don't expect a lot of objects to
780	* have move_allow right now.	784	* have move_allow right now.
781	*/	785	*/
782	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	786	\|\| ((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 ();	787	m.invalidate ();
		788	#else
		789	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
		790	m.invalidate ();
		791	#endif
785	}	792	}
786	/* if the object is being removed, we can't make intelligent	793	/* if the object is being removed, we can't make intelligent
787	* decisions, because remove_ob can't really pass the object	794	* decisions, because remove_ob can't really pass the object
788	* that is being removed.	795	* that is being removed.
789	*/	796	*/
…		…
798	update_object (op->more, action);	805	update_object (op->more, action);
799	}	806	}
800		807
801	object::object ()	808	object::object ()
802	{	809	{
803	SET_FLAG (this, FLAG_REMOVED);	810	this->set_flag (FLAG_REMOVED);
804		811
805	//expmul = 1.0; declared const for the time being	812	//expmul = 1.0; declared const for the time being
806	face = blank_face;	813	face = blank_face;
		814	material = MATERIAL_NULL;
807	}	815	}
808		816
809	object::~object ()	817	object::~object ()
810	{	818	{
811	unlink ();	819	unlink ();
812		820
813	free_key_values (this);	821	free_key_values (this);
814	}	822	}
815
816	static int object_count;
817		823
818	void object::link ()	824	void object::link ()
819	{	825	{
820	assert (!index);//D	826	assert (!index);//D
821	uuid = UUID::gen ();	827	uuid = UUID::gen ();
822	count = ++object_count;
823		828
824	refcnt_inc ();	829	refcnt_inc ();
825	objects.insert (this);	830	objects.insert (this);
		831
		832	++create_count;
		833
826	}	834	}
827		835
828	void object::unlink ()	836	void object::unlink ()
829	{	837	{
830	if (!index)	838	if (!index)
831	return;	839	return;
		840
		841	++destroy_count;
832		842
833	objects.erase (this);	843	objects.erase (this);
834	refcnt_dec ();	844	refcnt_dec ();
835	}	845	}
836		846
…		…
941	map->insert (op, x, y);	951	map->insert (op, x, y);
942	}	952	}
943	}	953	}
944	}	954	}
945		955
		956	/*
		957	* Remove and free all objects in the inventory of the given object.
		958	* Unlike destroy_inv, this assumes the *this is destroyed as well
		959	* well, so we can (and have to!) take shortcuts.
		960	*/
		961	void
		962	object::destroy_inv_fast ()
		963	{
		964	while (object *op = inv)
		965	{
		966	// remove from object the fast way
		967	op->flag [FLAG_REMOVED] = true;
		968	op->env = 0;
		969	if ((inv = inv->below))
		970	inv->above = 0;
		971
		972	// then destroy
		973	op->destroy ();
		974	}
		975	}
		976
		977	void
		978	object::freelist_free (int count)
		979	{
		980	while (count-- && freelist)
		981	{
		982	freelist_item *next = freelist->next;
		983	// count is being "destroyed"
		984
		985	sfree ((char *)freelist, sizeof (object));
		986
		987	freelist = next;
		988	--free_count;
		989	}
		990	}
		991
		992	object *
946	object *object::create ()	993	object::create ()
947	{	994	{
948	object *op = new object;	995	object *op;
		996
		997	if (freelist)
		998	{
		999	freelist_item li = *freelist;
		1000	memset (freelist, 0, sizeof (object));
		1001
		1002	op = new (freelist) object;
		1003	op->count = li.count;
		1004
		1005	freelist = li.next;
		1006	--free_count;
		1007	}
		1008	else
		1009	{
		1010	void *ni = salloc0<char> (sizeof (object));
		1011
		1012	op = new(ni) object;
		1013
		1014	op->count = ++object_count;
		1015	}
		1016
949	op->link ();	1017	op->link ();
		1018
950	return op;	1019	return op;
951	}	1020	}
952		1021
		1022	void
		1023	object::do_delete ()
		1024	{
		1025	uint32_t count = this->count;
		1026
		1027	this->~object ();
		1028
		1029	freelist_item li = (freelist_item )this;
		1030	li->next = freelist;
		1031	li->count = count;
		1032
		1033	freelist = li;
		1034	++free_count;
		1035	}
		1036
953	static struct freed_map : maptile	1037	static struct freed_map : maptile
954	{	1038	{
955	freed_map ()	1039	freed_map ()
		1040	: maptile (3, 3)
956	{	1041	{
957	path = "<freed objects map>";	1042	path = "<freed objects map>";
958	name = "/internal/freed_objects_map";	1043	name = "/internal/freed_objects_map";
959	width = 3;
960	height = 3;
961	no_drop = 1;	1044	no_drop = 1;
962	no_reset = 1;	1045	no_reset = 1;
963		1046
964	alloc ();
965	in_memory = MAP_ACTIVE;	1047	in_memory = MAP_ACTIVE;
966	}	1048	}
967		1049
968	~freed_map ()	1050	~freed_map ()
969	{	1051	{
…		…
1020	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1102	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1021	head->destroy ();	1103	head->destroy ();
1022	return;	1104	return;
1023	}	1105	}
1024		1106
1025	destroy_inv (false);	1107	destroy_inv_fast ();
1026		1108
1027	if (is_head ())	1109	if (is_head ())
1028	if (sound_destroy)	1110	if (sound_destroy)
1029	play_sound (sound_destroy);	1111	play_sound (sound_destroy);
1030	else if (flag [FLAG_MONSTER])	1112	else if (flag [FLAG_MONSTER])
…		…
1082		1164
1083	above = 0;	1165	above = 0;
1084	below = 0;	1166	below = 0;
1085	env = 0;	1167	env = 0;
1086		1168
1087	/* NO_FIX_PLAYER is set when a great many changes are being	1169	if (pl && pl->is_player ())
1088	* made to players inventory. If set, avoiding the call
1089	* to save cpu time.
1090	*/	1170	{
1091	if (pl)	1171	if (expect_false (pl->contr->combat_ob == this))
1092	if (pl->is_player () && (glow_radius \|\| !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1093	{	1172	{
1094	pl->update_stats ();	1173	pl->apply (pl->contr->combat_ob, AP_UNAPPLY);
		1174	pl->contr->combat_ob = 0;
		1175	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
		1176	}
1095		1177
		1178	if (expect_false (pl->contr->ranged_ob == this))
		1179	{
		1180	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY);
		1181	pl->contr->ranged_ob = 0;
		1182	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
		1183	}
		1184
		1185	pl->contr->queue_stats_update ();
		1186
1096	if (glow_radius && pl->is_on_map ())	1187	if (expect_false (glow_radius) && pl->is_on_map ())
1097	update_all_los (pl->map, pl->x, pl->y);	1188	update_all_los (pl->map, pl->x, pl->y);
1098	}	1189	}
1099	}	1190	}
1100	else if (map)	1191	else if (map)
1101	{	1192	{
1102	map->dirty = true;	1193	map->dirty = true;
1103	mapspace &ms = this->ms ();	1194	mapspace &ms = this->ms ();
…		…
1121	else if (pl->container_ () == this)	1212	else if (pl->container_ () == this)
1122	{	1213	{
1123	// removing a container should close it	1214	// removing a container should close it
1124	close_container ();	1215	close_container ();
1125	}	1216	}
1126		1217	else
1127	esrv_del_item (pl->contr, count);	1218	esrv_del_item (pl->contr, count);
1128	}	1219	}
1129		1220
1130	/* link the object above us */	1221	/* link the object above us */
1131	// re-link, make sure compiler can easily use cmove	1222	// re-link, make sure compiler can easily use cmove
1132	*(above ? &above->below : &ms.top) = below;	1223	*(above ? &above->below : &ms.top) = below;
…		…
1223		1314
1224	object *prev = this;	1315	object *prev = this;
1225		1316
1226	for (archetype at = (archetype )arch->more; at; at = (archetype *)at->more)	1317	for (archetype at = (archetype )arch->more; at; at = (archetype *)at->more)
1227	{	1318	{
1228	object *op = arch_to_object (at);	1319	object *op = at->instance ();
1229		1320
1230	op->name = name;	1321	op->name = name;
1231	op->name_pl = name_pl;	1322	op->name_pl = name_pl;
1232	op->title = title;	1323	op->title = title;
1233		1324
…		…
1271	* Passing 0 for flag gives proper default values, so flag really only needs	1362	* Passing 0 for flag gives proper default values, so flag really only needs
1272	* to be set if special handling is needed.	1363	* to be set if special handling is needed.
1273	*	1364	*
1274	* Return value:	1365	* Return value:
1275	* new object if 'op' was merged with other object	1366	* new object if 'op' was merged with other object
1276	* NULL if 'op' was destroyed	1367	* NULL if there was an error (destroyed, blocked etc.)
1277	* just 'op' otherwise	1368	* just 'op' otherwise
1278	*/	1369	*/
1279	object *	1370	object *
1280	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1371	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1281	{	1372	{
…		…
1318	// from here :/	1409	// from here :/
1319	op->nrof += tmp->nrof;	1410	op->nrof += tmp->nrof;
1320	tmp->destroy ();	1411	tmp->destroy ();
1321	}	1412	}
1322		1413
1323	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1414	op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1324	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1415	op->clr_flag (FLAG_INV_LOCKED);
1325		1416
1326	if (!QUERY_FLAG (op, FLAG_ALIVE))	1417	if (!op->flag [FLAG_ALIVE])
1327	CLEAR_FLAG (op, FLAG_NO_STEAL);	1418	op->clr_flag (FLAG_NO_STEAL);
1328		1419
1329	if (flag & INS_BELOW_ORIGINATOR)	1420	if (flag & INS_BELOW_ORIGINATOR)
1330	{	1421	{
1331	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y)	1422	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y)
1332	{	1423	{
…		…
1367	* when lots of spells are cast in one area. Currently, it is presumed	1458	* when lots of spells are cast in one area. Currently, it is presumed
1368	* that flying non pickable objects are spell objects.	1459	* that flying non pickable objects are spell objects.
1369	*/	1460	*/
1370	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1461	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1371	{	1462	{
1372	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))	1463	if (tmp->flag [FLAG_IS_FLOOR] \|\| tmp->flag [FLAG_OVERLAY_FLOOR])
1373	floor = tmp;	1464	floor = tmp;
1374		1465
1375	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1466	if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1376	{	1467	{
1377	/* We insert above top, so we want this object below this */	1468	/* We insert above top, so we want this object below this */
1378	top = tmp->below;	1469	top = tmp->below;
1379	break;	1470	break;
1380	}	1471	}
…		…
1398	&& (op->face && !faces [op->face].visibility))	1489	&& (op->face && !faces [op->face].visibility))
1399	{	1490	{
1400	object *last;	1491	object *last;
1401		1492
1402	for (last = top; last != floor; last = last->below)	1493	for (last = top; last != floor; last = last->below)
1403	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1494	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1404	break;	1495	break;
1405		1496
1406	/* Check to see if we found the object that blocks view,	1497	/* Check to see if we found the object that blocks view,
1407	* and make sure we have a below pointer for it so that	1498	* and make sure we have a below pointer for it so that
1408	* we can get inserted below this one, which requires we	1499	* we can get inserted below this one, which requires we
…		…
1508		1599
1509	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1600	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1510	if (tmp->arch->archname == archname) /* same archetype */	1601	if (tmp->arch->archname == archname) /* same archetype */
1511	tmp->destroy ();	1602	tmp->destroy ();
1512		1603
1513	object *tmp = arch_to_object (archetype::find (archname));	1604	object *tmp = archetype::find (archname)->instance ();
1514		1605
1515	tmp->x = op->x;	1606	tmp->x = op->x;
1516	tmp->y = op->y;	1607	tmp->y = op->y;
1517		1608
1518	insert_ob_in_map (tmp, op->map, op, 0);	1609	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1523	{	1614	{
1524	if (where->env)	1615	if (where->env)
1525	return where->env->insert (this);	1616	return where->env->insert (this);
1526	else	1617	else
1527	return where->map->insert (this, where->x, where->y, originator, flags);	1618	return where->map->insert (this, where->x, where->y, originator, flags);
		1619	}
		1620
		1621	// check whether we can put this into the map, respect max_volume, max_items
		1622	bool
		1623	object::can_drop_at (maptile m, int x, int y, object originator)
		1624	{
		1625	mapspace &ms = m->at (x, y);
		1626
		1627	int items = ms.items ();
		1628
		1629	if (!items // testing !items ensures we can drop at least one item
		1630	\|\| (items < m->max_items
		1631	&& ms.volume () < m->max_volume))
		1632	return true;
		1633
		1634	if (originator && originator->is_player ())
		1635	originator->contr->failmsgf (
		1636	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1637	query_name ()
		1638	);
		1639
		1640	return false;
1528	}	1641	}
1529		1642
1530	/*	1643	/*
1531	* decrease(object, number) decreases a specified number from	1644	* decrease(object, number) decreases a specified number from
1532	* the amount of an object. If the amount reaches 0, the object	1645	* the amount of an object. If the amount reaches 0, the object
…		…
1672	if (op->glow_radius && is_on_map ())	1785	if (op->glow_radius && is_on_map ())
1673	{	1786	{
1674	update_stats ();	1787	update_stats ();
1675	update_all_los (map, x, y);	1788	update_all_los (map, x, y);
1676	}	1789	}
1677	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])	1790	else if (is_player ())
1678	// if this is a player's inventory, update stats	1791	// if this is a player's inventory, update stats
1679	update_stats ();	1792	contr->queue_stats_update ();
1680		1793
1681	INVOKE_OBJECT (INSERT, this);	1794	INVOKE_OBJECT (INSERT, this);
1682		1795
1683	return op;	1796	return op;
1684	}	1797	}
…		…
1704	* on top.	1817	* on top.
1705	*/	1818	*/
1706	int	1819	int
1707	check_move_on (object op, object originator)	1820	check_move_on (object op, object originator)
1708	{	1821	{
1709	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1822	if (op->flag [FLAG_NO_APPLY])
1710	return 0;	1823	return 0;
1711		1824
1712	object *tmp;	1825	object *tmp;
1713	maptile *m = op->map;	1826	maptile *m = op->map;
1714	int x = op->x, y = op->y;	1827	int x = op->x, y = op->y;
…		…
1751	* Second check makes sure that the movement types not being slowed	1864	* Second check makes sure that the movement types not being slowed
1752	* (~slow_move) is not blocked on this space - just because the	1865	* (~slow_move) is not blocked on this space - just because the
1753	* space doesn't slow down swimming (for example), if you can't actually	1866	* space doesn't slow down swimming (for example), if you can't actually
1754	* swim on that space, can't use it to avoid the penalty.	1867	* swim on that space, can't use it to avoid the penalty.
1755	*/	1868	*/
1756	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1869	if (!op->flag [FLAG_WIZPASS])
1757	{	1870	{
1758	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1871	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1759	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1872	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1760	{	1873	{
1761	float diff = tmp->move_slow_penalty * fabs (op->speed);	1874	float diff = tmp->move_slow_penalty * fabs (op->speed);
…		…
1892	void	2005	void
1893	flag_inv (object *op, int flag)	2006	flag_inv (object *op, int flag)
1894	{	2007	{
1895	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2008	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1896	{	2009	{
1897	SET_FLAG (tmp, flag);	2010	tmp->set_flag (flag);
1898	flag_inv (tmp, flag);	2011	flag_inv (tmp, flag);
1899	}	2012	}
1900	}	2013	}
1901		2014
1902	/*	2015	/*
…		…
1905	void	2018	void
1906	unflag_inv (object *op, int flag)	2019	unflag_inv (object *op, int flag)
1907	{	2020	{
1908	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2021	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1909	{	2022	{
1910	CLEAR_FLAG (tmp, flag);	2023	tmp->clr_flag (flag);
1911	unflag_inv (tmp, flag);	2024	unflag_inv (tmp, flag);
1912	}	2025	}
1913	}	2026	}
1914		2027
1915	/*	2028	/*
…		…
2105	{	2218	{
2106	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2219	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2107	}	2220	}
2108		2221
2109	/*	2222	/*
2110	* find_dir_2(delta-x,delta-y) will return a direction in which	2223	* find_dir_2(delta-x,delta-y) will return a direction value
2111	* an object which has subtracted the x and y coordinates of another	2224	* for running into direct [dx, dy].
2112	* object, needs to travel toward it.	2225	* (the opposite of crossfire's find_dir_2!)
2113	*/	2226	*/
2114	int	2227	int
2115	find_dir_2 (int x, int y)	2228	find_dir_2 (int x, int y)
2116	{	2229	{
2117	int q;	2230	int q;
2118		2231
2119	if (y)	2232	if (y)
2120	q = x * 100 / y;	2233	q = 128 * x / y;
2121	else if (x)	2234	else if (x)
2122	q = -300 * x;	2235	q = -512 * x; // to make it > 309
2123	else	2236	else
2124	return 0;	2237	return 0;
2125		2238
2126	if (y > 0)	2239	if (y > 0)
2127	{	2240	{
2128	if (q < -242)	2241	if (q < -309) return 7;
		2242	if (q < -52) return 6;
		2243	if (q < 52) return 5;
		2244	if (q < 309) return 4;
		2245
2129	return 3;	2246	return 3;
2130	if (q < -41)	2247	}
2131	return 2;	2248	else
2132	if (q < 41)	2249	{
2133	return 1;	2250	if (q < -309) return 3;
2134	if (q < 242)	2251	if (q < -52) return 2;
2135	return 8;	2252	if (q < 52) return 1;
		2253	if (q < 309) return 8;
		2254
2136	return 7;	2255	return 7;
2137	}	2256	}
2138
2139	if (q < -242)
2140	return 7;
2141	if (q < -41)
2142	return 6;
2143	if (q < 41)
2144	return 5;
2145	if (q < 242)
2146	return 4;
2147
2148	return 3;
2149	}	2257	}
2150		2258
2151	/*	2259	/*
2152	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2260	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2153	* between two directions (which are expected to be absolute (see absdir())	2261	* between two directions (which are expected to be absolute (see absdir())
2154	*/	2262	*/
2155	int	2263	int
2156	dirdiff (int dir1, int dir2)	2264	dirdiff (int dir1, int dir2)
2157	{	2265	{
2158	int d;
2159
2160	d = abs (dir1 - dir2);	2266	int d = abs (dir1 - dir2);
2161	if (d > 4)
2162	d = 8 - d;
2163		2267
2164	return d;	2268	return d > 4 ? 8 - d : d;
2165	}	2269	}
2166		2270
2167	/* peterm:	2271	/* peterm:
2168	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2272	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2169	* Basically, this is a table of directions, and what directions	2273	* Basically, this is a table of directions, and what directions
…		…
2171	* This basically means that if direction is 15, then it could either go	2275	* This basically means that if direction is 15, then it could either go
2172	* direction 4, 14, or 16 to get back to where we are.	2276	* direction 4, 14, or 16 to get back to where we are.
2173	* Moved from spell_util.c to object.c with the other related direction	2277	* Moved from spell_util.c to object.c with the other related direction
2174	* functions.	2278	* functions.
2175	*/	2279	*/
2176	const int reduction_dir[SIZEOFFREE][3] = {	2280	static const int reduction_dir[SIZEOFFREE][3] = {
2177	{0, 0, 0}, /* 0 */	2281	{0, 0, 0}, /* 0 */
2178	{0, 0, 0}, /* 1 */	2282	{0, 0, 0}, /* 1 */
2179	{0, 0, 0}, /* 2 */	2283	{0, 0, 0}, /* 2 */
2180	{0, 0, 0}, /* 3 */	2284	{0, 0, 0}, /* 3 */
2181	{0, 0, 0}, /* 4 */	2285	{0, 0, 0}, /* 4 */
…		…
2275	* Add a check so we can't pick up invisible objects (0.93.8)	2379	* Add a check so we can't pick up invisible objects (0.93.8)
2276	*/	2380	*/
2277	int	2381	int
2278	can_pick (const object who, const object item)	2382	can_pick (const object who, const object item)
2279	{	2383	{
2280	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2384	return /who->flag [FLAG_WIZ]\|\| /
2281	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2385	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2282	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));	2386	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2283	}	2387	}
2284		2388
2285	/*	2389	/*
2286	* create clone from object to another	2390	* create clone from object to another
2287	*/	2391	*/
…		…
2452	{	2556	{
2453	return map ? map->region (x, y)	2557	return map ? map->region (x, y)
2454	: region::default_region ();	2558	: region::default_region ();
2455	}	2559	}
2456		2560
2457	const materialtype_t *
2458	object::dominant_material () const
2459	{
2460	if (materialtype_t *mt = name_to_material (materialname))
2461	return mt;
2462
2463	return name_to_material (shstr_unknown);
2464	}
2465
2466	void	2561	void
2467	object::open_container (object *new_container)	2562	object::open_container (object *new_container)
2468	{	2563	{
2469	if (container == new_container)	2564	if (container == new_container)
2470	return;	2565	return;
…		…
2504	// TODO: this does not seem to serve any purpose anymore?	2599	// TODO: this does not seem to serve any purpose anymore?
2505	#if 0	2600	#if 0
2506	// insert the "Close Container" object.	2601	// insert the "Close Container" object.
2507	if (archetype *closer = new_container->other_arch)	2602	if (archetype *closer = new_container->other_arch)
2508	{	2603	{
2509	object *closer = arch_to_object (new_container->other_arch);	2604	object *closer = new_container->other_arch->instance ();
2510	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2605	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2511	new_container->insert (closer);	2606	new_container->insert (closer);
2512	}	2607	}
2513	#endif	2608	#endif
2514		2609
…		…
2540	return splay (tmp);	2635	return splay (tmp);
2541		2636
2542	return 0;	2637	return 0;
2543	}	2638	}
2544		2639
		2640	//-GPL
		2641
2545	void	2642	void
2546	object::force_set_timer (int duration)	2643	object::force_set_timer (int duration)
2547	{	2644	{
2548	this->duration = 1;	2645	this->duration = 1;
2549	this->speed_left = -1.f;	2646	this->speed_left = -1.f;
…		…
2558	force->destroy ();	2655	force->destroy ();
2559		2656
2560	object *force = get_archetype (FORCE_NAME);	2657	object *force = get_archetype (FORCE_NAME);
2561		2658
2562	force->slaying = name;	2659	force->slaying = name;
2563
2564	force->force_set_timer (duration);	2660	force->force_set_timer (duration);
2565
2566	force->flag [FLAG_APPLIED] = true;	2661	force->flag [FLAG_APPLIED] = true;
2567		2662
2568	return insert (force);	2663	return insert (force);
2569	}	2664	}
2570		2665
2571	void	2666	void
…		…
2620		2715
2621	insert (force);	2716	insert (force);
2622	}	2717	}
2623	}	2718	}
2624		2719
		2720	void object::change_move_type (MoveType mt)
		2721	{
		2722	if (move_type == mt)
		2723	return;
		2724
		2725	if (is_on_map ())
		2726	{
		2727	// we are on the map, so handle move_on/off effects
		2728	remove ();
		2729	move_type = mt;
		2730	map->insert (this, x, y, this);
		2731	}
		2732	else
		2733	move_type = mt;
		2734	}
		2735
		2736	/* object should be a player.
		2737	* we return the object the player has marked with the 'mark' command
		2738	* below. If no match is found (or object has changed), we return
		2739	* NULL. We leave it up to the calling function to print messages if
		2740	* nothing is found.
		2741	*/
		2742	object *
		2743	object::mark () const
		2744	{
		2745	if (contr && contr->mark && contr->mark->env == this)
		2746	return contr->mark;
		2747	else
		2748	return 0;
		2749	}
		2750

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.293 by root, Wed Oct 21 00:44:39 2009 UTC vs. Revision 1.329 by root, Sun Apr 18 12:50:07 2010 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.293 by root, Wed Oct 21 00:44:39 2009 UTC vs.
Revision 1.329 by root, Sun Apr 18 12:50:07 2010 UTC