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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.291 by root, Mon Oct 12 14:00:57 2009 UTC vs.
Revision 1.339 by root, Fri Jul 2 17:39:23 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
		76	const char *wall_suffix[16] = {
		77	"0",
		78	"1_3",
		79	"1_4",
		80	"2_1_2",
		81	"1_2",
		82	"2_2_4",
		83	"2_2_1",
		84	"3_1",
		85	"1_1",
		86	"2_2_3",
		87	"2_2_2",
		88	"3_3",
		89	"2_1_1",
		90	"3_4",
		91	"3_2",
		92	"4"
		93	};
		94
68	static void	95	static void
69	write_uuid (uval64 skip, bool sync)	96	write_uuid (uval64 skip, bool sync)
70	{	97	{
71	CALL_BEGIN (2);	98	CALL_BEGIN (2);
72	CALL_ARG_SV (newSVval64 (skip));	99	CALL_ARG_SV (newSVval64 (skip));
…		…
74	CALL_CALL ("cf::write_uuid", G_DISCARD);	101	CALL_CALL ("cf::write_uuid", G_DISCARD);
75	CALL_END;	102	CALL_END;
76	}	103	}
77		104
78	static void	105	static void
79	read_uuid (void)	106	read_uuid ()
80	{	107	{
81	char filename[MAX_BUF];	108	char filename[MAX_BUF];
82		109
83	sprintf (filename, "%s/uuid", settings.localdir);	110	sprintf (filename, "%s/uuid", settings.localdir);
84		111
…		…
98		125
99	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	126	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100	_exit (1);	127	_exit (1);
101	}	128	}
102		129
103	UUID::BUF buf;	130	char buf [UUID::MAX_LEN];
104	buf[0] = 0;	131	buf[0] = 0;
105	fgets (buf, sizeof (buf), fp);	132	fgets (buf, sizeof (buf), fp);
106		133
107	if (!UUID::cur.parse (buf))	134	if (!UUID::cur.parse (buf))
108	{	135	{
…		…
135		162
136	void	163	void
137	UUID::init ()	164	UUID::init ()
138	{	165	{
139	read_uuid ();	166	read_uuid ();
		167	}
		168
		169	bool
		170	UUID::parse (const char *s)
		171	{
		172	if (s++ != '<' \|\| s++ != '1' \|\| *s++ != '.')
		173	return false;
		174
		175	seq = 0;
		176
		177	while (*s != '>')
		178	{
		179	if (*s < '0')
		180	return false;
		181
		182	// this gives nice branchless code with gcc
		183	assert ('0' < 'a' && '0' == 48 && 'a' == 97);
		184	int digit = (s + (s & 0x40 ? 9 : 0)) & 15;
		185
		186	seq = (seq << 4) \| digit;
		187
		188	++s;
		189	}
		190
		191	return true;
		192	}
		193
		194	char *
		195	UUID::append (char *buf) const
		196	{
		197	*buf++ = '<';
		198	*buf++ = '1';
		199	*buf++ = '.';
		200
		201	uint64_t seq = this->seq;
		202	const int bits = 64;
		203	char nz = 0;
		204	static const char tohex [] = "0123456789abcdef";
		205
		206	// assert (len >= 3 + bits / 4 + 1 + 1);
		207	for (int i = bits / 4; --i; )
		208	{
		209	uint8_t digit = seq >> (bits - 4);
		210
		211	*buf = tohex [digit];
		212	nz \|= digit;
		213	buf += nz ? 1 : 0;
		214	seq <<= 4;
		215	}
		216
		217	// last digit is special - always emit
		218	uint8_t digit = seq >> (bits - 4);
		219	*buf++ = tohex [digit];
		220
		221	*buf++ = '>';
		222
		223	return buf;
		224	}
		225
		226	char *
		227	UUID::c_str () const
		228	{
		229	static char buf [MAX_LEN];
		230	*append (buf) = 0;
		231	return buf;
140	}	232	}
141		233
142	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	234	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
143	static bool	235	static bool
144	compare_ob_value_lists_one (const object wants, const object has)	236	compare_ob_value_lists_one (const object wants, const object has)
…		…
180	* Improvements made with merge: Better checking on potion, and also	272	* Improvements made with merge: Better checking on potion, and also
181	* check weight	273	* check weight
182	*/	274	*/
183	bool object::can_merge_slow (object ob1, object ob2)	275	bool object::can_merge_slow (object ob1, object ob2)
184	{	276	{
185	/* A couple quicksanity checks */	277	/* A couple quick sanity checks */
186	if (ob1 == ob2	278	if (ob1 == ob2
187	\|\| ob1->type != ob2->type	279	\|\| ob1->type != ob2->type
188	\|\| ob1->speed != ob2->speed
189	\|\| ob1->value != ob2->value	280	\|\| ob1->value != ob2->value
190	\|\| ob1->name != ob2->name)	281	\|\| ob1->name != ob2->name
		282	\|\| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
191	return 0;	283	return 0;
192		284
193	/* Do not merge objects if nrof would overflow, assume nrof	285	/* Do not merge objects if nrof would overflow, assume nrof
194	* is always 0 .. 2*31-1 /	286	* is always 0 .. 2*31-1 /
195	if (ob1->nrof > 0x7fffffff - ob2->nrof)	287	if (ob1->nrof > 0x7fffffff - ob2->nrof)
…		…
199	* This is to the comparison of the flags below will be OK. We	291	* 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	292	* 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	293	* are not equal - just if it has been identified, the been_applied
202	* flags lose any meaning.	294	* flags lose any meaning.
203	*/	295	*/
204	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	296	if (ob1->flag [FLAG_IDENTIFIED])
205	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	297	ob1->set_flag (FLAG_BEEN_APPLIED);
206		298
207	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	299	if (ob2->flag [FLAG_IDENTIFIED])
208	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	300	ob2->set_flag (FLAG_BEEN_APPLIED);
209		301
210	if (ob1->arch->archname != ob2->arch->archname	302	if (ob1->arch->archname != ob2->arch->archname
211	\|\| ob1->name != ob2->name	303	\|\| ob1->name != ob2->name
212	\|\| ob1->title != ob2->title	304	\|\| ob1->title != ob2->title
213	\|\| ob1->msg != ob2->msg	305	\|\| ob1->msg != ob2->msg
…		…
216	\|\| ob1->magic != ob2->magic	308	\|\| ob1->magic != ob2->magic
217	\|\| ob1->slaying != ob2->slaying	309	\|\| ob1->slaying != ob2->slaying
218	\|\| ob1->skill != ob2->skill	310	\|\| ob1->skill != ob2->skill
219	\|\| ob1->value != ob2->value	311	\|\| ob1->value != ob2->value
220	\|\| ob1->animation_id != ob2->animation_id	312	\|\| ob1->animation_id != ob2->animation_id
221	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other	313	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
222	\|\| ob1->client_type != ob2->client_type	314	\|\| ob1->client_type != ob2->client_type
223	\|\| ob1->materialname != ob2->materialname	315	\|\| ob1->material != ob2->material
224	\|\| ob1->lore != ob2->lore	316	\|\| ob1->lore != ob2->lore
225	\|\| ob1->subtype != ob2->subtype	317	\|\| ob1->subtype != ob2->subtype
226	\|\| ob1->move_type != ob2->move_type	318	\|\| ob1->move_type != ob2->move_type
227	\|\| ob1->move_block != ob2->move_block	319	\|\| ob1->move_block != ob2->move_block
228	\|\| ob1->move_allow != ob2->move_allow	320	\|\| ob1->move_allow != ob2->move_allow
229	\|\| ob1->move_on != ob2->move_on	321	\|\| ob1->move_on != ob2->move_on
230	\|\| ob1->move_off != ob2->move_off	322	\|\| ob1->move_off != ob2->move_off
231	\|\| ob1->move_slow != ob2->move_slow	323	\|\| ob1->move_slow != ob2->move_slow
232	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty	324	\|\| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
233	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	325	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
234	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	326	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
235	return 0;	327	return 0;
236		328
237	if ((ob1->flag ^ ob2->flag)	329	if ((ob1->flag ^ ob2->flag)
…		…
262		354
263	/* Don't merge objects that are applied. With the new 'body' code,	355	/* 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	356	* 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.	357	* some items equipped, and we don't want those to merge.
266	*/	358	*/
267	if (QUERY_FLAG (ob1, FLAG_APPLIED) \|\| QUERY_FLAG (ob2, FLAG_APPLIED))	359	if (ob1->flag [FLAG_APPLIED] \|\| ob2->flag [FLAG_APPLIED])
268	return 0;	360	return 0;
269		361
270	/* Note sure why the following is the case - either the object has to	362	/* 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	363	* be animated or have a very low speed. Is this an attempted monster
272	* check?	364	* check?
273	*/	365	*/
274	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())	366	if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
275	return 0;	367	return 0;
276		368
277	switch (ob1->type)	369	switch (ob1->type)
278	{	370	{
279	case SCROLL:	371	case SCROLL:
…		…
335		427
336	// the player itself is always on a map, so we will find him here	428	// the player itself is always on a map, so we will find him here
337	// even if our inv is in a player.	429	// even if our inv is in a player.
338	if (envest->is_on_map ())	430	if (envest->is_on_map ())
339	if (object *pl = envest->ms ().player ())	431	if (object *pl = envest->ms ().player ())
340	if (pl->container == env)	432	if (pl->container_ () == env)
341	return pl;	433	return pl;
342	}	434	}
343	else	435	else
344	{	436	{
345	// maybe there is a player standing on the same mapspace	437	// maybe there is a player standing on the same mapspace
346	// this will catch the case where "this" is a player	438	// this will catch the case where "this" is a player
347	if (object *pl = ms ().player ())	439	if (object *pl = ms ().player ())
348	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)	440	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
349	\|\| this == pl->container)	441	\|\| pl->container_ () == this)
350	return pl;	442	return pl;
351	}	443	}
352	}	444	}
353		445
354	return 0;	446	return 0;
355	}	447	}
356		448
357	// adjust weight per container type ("of holding")	449	// adjust weight per container type ("of holding")
358	static sint32	450	static uint32
359	weight_adjust_for (object *op, sint32 weight)	451	weight_adjust_for (object *op, uint32 weight)
360	{	452	{
361	return op->type == CONTAINER	453	return op->type == CONTAINER
362	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	454	? weight - weight * op->stats.Str / 100
363	: weight;	455	: weight;
364	}	456	}
365		457
366	/*	458	/*
367	* adjust_weight(object, weight) adds the specified weight to an object,	459	* subtracts, then adds, the specified weight to an object,
368	* and also updates how much the environment(s) is/are carrying.	460	* and also updates how much the environment(s) is/are carrying.
369	*/	461	*/
370	static void	462	static void
371	adjust_weight (object *op, sint32 weight)	463	adjust_weight (object *op, sint32 sub, sint32 add)
372	{	464	{
373	while (op)	465	while (op)
374	{	466	{
375	// adjust by actual difference to account for rounding errors	467	sint32 ocarrying = op->carrying;
376	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
377	weight = weight_adjust_for (op, op->carrying)
378	- weight_adjust_for (op, op->carrying - weight);
379		468
380	if (!weight)	469	op->carrying -= weight_adjust_for (op, sub);
381	return;	470	op->carrying += weight_adjust_for (op, add);
382
383	op->carrying += weight;
384		471
385	if (object *pl = op->visible_to ())	472	if (object *pl = op->visible_to ())
386	if (pl != op) // player is handled lazily	473	if (pl != op) // player is handled lazily
387	esrv_update_item (UPD_WEIGHT, pl, op);	474	esrv_update_item (UPD_WEIGHT, pl, op);
388		475
		476	sub = ocarrying;
		477	add = op->carrying;
		478
389	op = op->env;	479	op = op->env;
390	}	480	}
391	}	481	}
392		482
393	/*	483	/*
…		…
400	{	490	{
401	sint32 sum = 0;	491	sint32 sum = 0;
402		492
403	for (object *op = inv; op; op = op->below)	493	for (object *op = inv; op; op = op->below)
404	{	494	{
405	if (op->inv)
406	op->update_weight ();	495	op->update_weight ();
407		496
408	sum += op->total_weight ();	497	sum += weight_adjust_for (this, op->total_weight ());
409	}	498	}
410
411	sum = weight_adjust_for (this, sum);
412		499
413	if (sum != carrying)	500	if (sum != carrying)
414	{	501	{
		502	if (carrying != sum && carrying)//D
		503	LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n",
		504	(long long)sum, (long long)carrying, debug_desc ());
		505
415	carrying = sum;	506	carrying = sum;
416		507
417	if (object *pl = visible_to ())	508	if (object *pl = visible_to ())
418	if (pl != this) // player is handled lazily	509	if (pl != this) // player is handled lazily
419	esrv_update_item (UPD_WEIGHT, pl, this);	510	esrv_update_item (UPD_WEIGHT, pl, this);
…		…
439	{	530	{
440	return dump_object (this);	531	return dump_object (this);
441	}	532	}
442		533
443	/*	534	/*
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.	535	* Returns the object which has the count-variable equal to the argument.
468	* VERRRY slow.	536	* VERRRY slow.
469	*/	537	*/
470	object *	538	object *
471	find_object (tag_t i)	539	find_object (tag_t i)
472	{	540	{
473	for_all_objects (op)	541	for_all_objects (op)
474	if (op->count == i)	542	if (op->count == i)
		543	return op;
		544
		545	return 0;
		546	}
		547
		548	/*
		549	* Returns the object which has the uuid equal to the argument.
		550	* MOAR VERRRY slow.
		551	*/
		552
		553	object *
		554	find_object_uuid (UUID i)
		555	{
		556	for_all_objects (op)
		557	if (op->uuid == i)
475	return op;	558	return op;
476		559
477	return 0;	560	return 0;
478	}	561	}
479		562
…		…
513	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());	596	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
514	return;	597	return;
515	}	598	}
516		599
517	this->owner = owner;	600	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	}	601	}
586		602
587	/* Zero the key_values on op, decrementing the shared-string	603	/* Zero the key_values on op, decrementing the shared-string
588	* refcounts and freeing the links.	604	* refcounts and freeing the links.
589	*/	605	*/
…		…
642	tail = new_link;	658	tail = new_link;
643	}	659	}
644	}	660	}
645	}	661	}
646		662
647	if (speed < 0)
648	dst->speed_left -= rndm ();
649
650	dst->activate ();	663	dst->activate ();
651	}	664	}
652		665
653	void	666	void
654	object::instantiate ()	667	object::instantiate ()
655	{	668	{
656	if (!uuid.seq) // HACK	669	if (!uuid.seq) // HACK
657	uuid = UUID::gen ();	670	uuid = UUID::gen ();
658		671
		672	// TODO: unclean state changes, should nt be done in copy_to AND instantiate
		673	if (flag [FLAG_RANDOM_SPEED] && speed)
		674	speed_left = - speed - rndm (); // TODO animation
		675	else
659	speed_left = -0.1f;	676	speed_left = -1.;
		677
660	/* copy the body_info to the body_used - this is only really	678	/* 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.	679	* 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	680	* by doing so, when a monster is created, it has good starting
663	* values for the body_used info, so when items are created	681	* values for the body_used info, so when items are created
664	* for it, they can be properly equipped.	682	* for it, they can be properly equipped.
…		…
672	object *	690	object *
673	object::clone ()	691	object::clone ()
674	{	692	{
675	object *neu = create ();	693	object *neu = create ();
676	copy_to (neu);	694	copy_to (neu);
		695
		696	// TODO: unclean state changes, should not be done in clone AND instantiate
		697	if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
		698	neu->speed_left = - neu->speed - rndm (); // TODO animation
		699
677	neu->map = map; // not copied by copy_to	700	neu->map = map; // not copied by copy_to
678	return neu;	701	return neu;
679	}	702	}
680		703
681	/*	704	/*
…		…
684	* be called to update the face variable, _and_ how it looks on the map.	707	* be called to update the face variable, _and_ how it looks on the map.
685	*/	708	*/
686	void	709	void
687	update_turn_face (object *op)	710	update_turn_face (object *op)
688	{	711	{
689	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) \|\| !op->arch)	712	if (!op->flag [FLAG_IS_TURNABLE] \|\| !op->arch)
690	return;	713	return;
691		714
692	SET_ANIMATION (op, op->direction);	715	SET_ANIMATION (op, op->direction);
693	update_object (op, UP_OBJ_FACE);	716	update_object (op, UP_OBJ_FACE);
694	}	717	}
…		…
699	* This function needs to be called whenever the speed of an object changes.	722	* This function needs to be called whenever the speed of an object changes.
700	*/	723	*/
701	void	724	void
702	object::set_speed (float speed)	725	object::set_speed (float speed)
703	{	726	{
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;	727	this->speed = speed;
711		728
712	if (has_active_speed ())	729	if (has_active_speed ())
713	activate ();	730	activate ();
714	else	731	else
…		…
764		781
765	if (!(m.flags_ & P_UPTODATE))	782	if (!(m.flags_ & P_UPTODATE))
766	/* nop */;	783	/* nop */;
767	else if (action == UP_OBJ_INSERT)	784	else if (action == UP_OBJ_INSERT)
768	{	785	{
		786	#if 0
769	// this is likely overkill, TODO: revisit (schmorp)	787	// this is likely overkill, TODO: revisit (schmorp)
770	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	788	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
771	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	789	\|\| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
772	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))	790	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
773	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	791	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
774	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	792	\|\| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
775	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	793	\|\| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
776	\|\| (m.move_on \| op->move_on ) != m.move_on	794	\|\| (m.move_on \| op->move_on ) != m.move_on
777	\|\| (m.move_off \| op->move_off ) != m.move_off	795	\|\| (m.move_off \| op->move_off ) != m.move_off
778	\|\| (m.move_slow \| op->move_slow) != m.move_slow	796	\|\| (m.move_slow \| op->move_slow) != m.move_slow
779	/* This isn't perfect, but I don't expect a lot of objects to	797	/* This isn't perfect, but I don't expect a lot of objects to
780	* have move_allow right now.	798	* have move_allow right now.
781	*/	799	*/
782	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	800	\|\| ((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 ();	801	m.invalidate ();
		802	#else
		803	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
		804	m.invalidate ();
		805	#endif
785	}	806	}
786	/* if the object is being removed, we can't make intelligent	807	/* if the object is being removed, we can't make intelligent
787	* decisions, because remove_ob can't really pass the object	808	* decisions, because remove_ob can't really pass the object
788	* that is being removed.	809	* that is being removed.
789	*/	810	*/
…		…
798	update_object (op->more, action);	819	update_object (op->more, action);
799	}	820	}
800		821
801	object::object ()	822	object::object ()
802	{	823	{
803	SET_FLAG (this, FLAG_REMOVED);	824	this->set_flag (FLAG_REMOVED);
804		825
805	//expmul = 1.0; declared const for the time being	826	//expmul = 1.0; declared const for the time being
806	face = blank_face;	827	face = blank_face;
		828	material = MATERIAL_NULL;
807	}	829	}
808		830
809	object::~object ()	831	object::~object ()
810	{	832	{
811	unlink ();	833	unlink ();
812		834
813	free_key_values (this);	835	free_key_values (this);
814	}	836	}
815
816	static int object_count;
817		837
818	void object::link ()	838	void object::link ()
819	{	839	{
820	assert (!index);//D	840	assert (!index);//D
821	uuid = UUID::gen ();	841	uuid = UUID::gen ();
822	count = ++object_count;
823		842
824	refcnt_inc ();	843	refcnt_inc ();
825	objects.insert (this);	844	objects.insert (this);
		845
		846	++create_count;
		847
826	}	848	}
827		849
828	void object::unlink ()	850	void object::unlink ()
829	{	851	{
830	if (!index)	852	if (!index)
831	return;	853	return;
		854
		855	++destroy_count;
832		856
833	objects.erase (this);	857	objects.erase (this);
834	refcnt_dec ();	858	refcnt_dec ();
835	}	859	}
836		860
…		…
941	map->insert (op, x, y);	965	map->insert (op, x, y);
942	}	966	}
943	}	967	}
944	}	968	}
945		969
		970	/*
		971	* Remove and free all objects in the inventory of the given object.
		972	* Unlike destroy_inv, this assumes the *this is destroyed as well
		973	* well, so we can (and have to!) take shortcuts.
		974	*/
		975	void
		976	object::destroy_inv_fast ()
		977	{
		978	while (object *op = inv)
		979	{
		980	// remove from object the fast way
		981	op->flag [FLAG_REMOVED] = true;
		982	op->env = 0;
		983	if ((inv = inv->below))
		984	inv->above = 0;
		985
		986	// then destroy
		987	op->destroy ();
		988	}
		989	}
		990
		991	void
		992	object::freelist_free (int count)
		993	{
		994	while (count-- && freelist)
		995	{
		996	freelist_item *next = freelist->next;
		997	// count is being "destroyed"
		998
		999	sfree ((char *)freelist, sizeof (object));
		1000
		1001	freelist = next;
		1002	--free_count;
		1003	}
		1004	}
		1005
		1006	object *
946	object *object::create ()	1007	object::create ()
947	{	1008	{
948	object *op = new object;	1009	object *op;
		1010
		1011	if (freelist)
		1012	{
		1013	freelist_item li = *freelist;
		1014	memset (freelist, 0, sizeof (object));
		1015
		1016	op = new (freelist) object;
		1017	op->count = li.count;
		1018
		1019	freelist = li.next;
		1020	--free_count;
		1021	}
		1022	else
		1023	{
		1024	void *ni = salloc0<char> (sizeof (object));
		1025
		1026	op = new(ni) object;
		1027
		1028	op->count = ++object_count;
		1029	}
		1030
949	op->link ();	1031	op->link ();
		1032
950	return op;	1033	return op;
951	}	1034	}
952		1035
		1036	void
		1037	object::do_delete ()
		1038	{
		1039	uint32_t count = this->count;
		1040
		1041	this->~object ();
		1042
		1043	freelist_item li = (freelist_item )this;
		1044	li->next = freelist;
		1045	li->count = count;
		1046
		1047	freelist = li;
		1048	++free_count;
		1049	}
		1050
953	static struct freed_map : maptile	1051	static struct freed_map : maptile
954	{	1052	{
955	freed_map ()	1053	freed_map ()
		1054	: maptile (3, 3)
956	{	1055	{
957	path = "<freed objects map>";	1056	path = "<freed objects map>";
958	name = "/internal/freed_objects_map";	1057	name = "/internal/freed_objects_map";
959	width = 3;
960	height = 3;
961	no_drop = 1;	1058	no_drop = 1;
962	no_reset = 1;	1059	no_reset = 1;
963		1060
964	alloc ();
965	in_memory = MAP_ACTIVE;	1061	in_memory = MAP_ACTIVE;
966	}	1062	}
967		1063
968	~freed_map ()	1064	~freed_map ()
969	{	1065	{
…		…
1020	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1116	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1021	head->destroy ();	1117	head->destroy ();
1022	return;	1118	return;
1023	}	1119	}
1024		1120
1025	destroy_inv (false);	1121	destroy_inv_fast ();
1026		1122
1027	if (is_head ())	1123	if (is_head ())
1028	if (sound_destroy)	1124	if (sound_destroy)
1029	play_sound (sound_destroy);	1125	play_sound (sound_destroy);
1030	else if (flag [FLAG_MONSTER])	1126	else if (flag [FLAG_MONSTER])
…		…
1041	* the previous environment.	1137	* the previous environment.
1042	*/	1138	*/
1043	void	1139	void
1044	object::do_remove ()	1140	object::do_remove ()
1045	{	1141	{
1046	object tmp, last = 0;
1047	object *otmp;
1048
1049	if (flag [FLAG_REMOVED])	1142	if (flag [FLAG_REMOVED])
1050	return;	1143	return;
1051		1144
1052	INVOKE_OBJECT (REMOVE, this);	1145	INVOKE_OBJECT (REMOVE, this);
1053		1146
…		…
1065	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed	1158	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1066	if (object *pl = visible_to ())	1159	if (object *pl = visible_to ())
1067	esrv_del_item (pl->contr, count);	1160	esrv_del_item (pl->contr, count);
1068	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1161	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1069		1162
1070	adjust_weight (env, -total_weight ());	1163	adjust_weight (env, total_weight (), 0);
1071		1164
1072	object *pl = in_player ();	1165	object *pl = in_player ();
1073		1166
1074	/* we set up values so that it could be inserted into	1167	/* we set up values so that it could be inserted into
1075	* the map, but we don't actually do that - it is up	1168	* the map, but we don't actually do that - it is up
…		…
1085		1178
1086	above = 0;	1179	above = 0;
1087	below = 0;	1180	below = 0;
1088	env = 0;	1181	env = 0;
1089		1182
1090	/* NO_FIX_PLAYER is set when a great many changes are being	1183	if (pl && pl->is_player ())
1091	* made to players inventory. If set, avoiding the call
1092	* to save cpu time.
1093	*/	1184	{
1094	if (pl)	1185	if (expect_false (pl->contr->combat_ob == this))
1095	if (pl->is_player () && (glow_radius \|\| !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1096	{	1186	{
1097	pl->update_stats ();	1187	pl->apply (pl->contr->combat_ob, AP_UNAPPLY \| AP_IGNORE_CURSE);
		1188	pl->contr->combat_ob = 0;
		1189	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
		1190	}
1098		1191
		1192	if (expect_false (pl->contr->ranged_ob == this))
		1193	{
		1194	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY \| AP_IGNORE_CURSE);
		1195	pl->contr->ranged_ob = 0;
		1196	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
		1197	}
		1198
		1199	pl->contr->queue_stats_update ();
		1200
1099	if (glow_radius && pl->is_on_map ())	1201	if (expect_false (glow_radius) && pl->is_on_map ())
1100	update_all_los (pl->map, pl->x, pl->y);	1202	update_all_los (pl->map, pl->x, pl->y);
1101	}	1203	}
1102	}	1204	}
1103	else if (map)	1205	else if (map)
1104	{	1206	{
1105	map->dirty = true;	1207	map->dirty = true;
1106	mapspace &ms = this->ms ();	1208	mapspace &ms = this->ms ();
…		…
1119	close_container ();	1221	close_container ();
1120		1222
1121	--map->players;	1223	--map->players;
1122	map->touch ();	1224	map->touch ();
1123	}	1225	}
1124	else if (pl->container == this)	1226	else if (pl->container_ () == this)
1125	{	1227	{
1126	// removing a container should close it	1228	// removing a container should close it
1127	close_container ();	1229	close_container ();
1128	}	1230	}
1129		1231	else
1130	esrv_del_item (pl->contr, count);	1232	esrv_del_item (pl->contr, count);
1131	}	1233	}
1132		1234
1133	/* link the object above us */	1235	/* link the object above us */
1134	// re-link, make sure compiler can easily use cmove	1236	// re-link, make sure compiler can easily use cmove
1135	*(above ? &above->below : &ms.top) = below;	1237	*(above ? &above->below : &ms.top) = below;
…		…
1145		1247
1146	int check_walk_off = !flag [FLAG_NO_APPLY];	1248	int check_walk_off = !flag [FLAG_NO_APPLY];
1147		1249
1148	if (object *pl = ms.player ())	1250	if (object *pl = ms.player ())
1149	{	1251	{
1150	if (pl->container == this)	1252	if (pl->container_ () == this)
1151	/* If a container that the player is currently using somehow gets	1253	/* If a container that the player is currently using somehow gets
1152	* removed (most likely destroyed), update the player view	1254	* removed (most likely destroyed), update the player view
1153	* appropriately.	1255	* appropriately.
1154	*/	1256	*/
1155	pl->close_container ();	1257	pl->close_container ();
…		…
1159	//TODO: update floorbox to preserve ordering	1261	//TODO: update floorbox to preserve ordering
1160	if (pl->contr->ns)	1262	if (pl->contr->ns)
1161	pl->contr->ns->floorbox_update ();	1263	pl->contr->ns->floorbox_update ();
1162	}	1264	}
1163		1265
		1266	if (check_walk_off)
1164	for (tmp = ms.bot; tmp; tmp = tmp->above)	1267	for (object above, tmp = ms.bot; tmp; tmp = above)
1165	{	1268	{
		1269	above = tmp->above;
		1270
1166	/* No point updating the players look faces if he is the object	1271	/* No point updating the players look faces if he is the object
1167	* being removed.	1272	* being removed.
1168	*/	1273	*/
1169		1274
1170	/* See if object moving off should effect something */	1275	/* See if object moving off should effect something */
1171	if (check_walk_off
1172	&& ((move_type & tmp->move_off)	1276	if ((move_type & tmp->move_off)
1173	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1277	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1174	{
1175	move_apply (tmp, this, 0);	1278	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	}	1279	}
1180
1181	last = tmp;
1182	}
1183		1280
1184	if (affects_los ())	1281	if (affects_los ())
1185	update_all_los (map, x, y);	1282	update_all_los (map, x, y);
1186	}	1283	}
1187	}	1284	}
…		…
1231		1328
1232	object *prev = this;	1329	object *prev = this;
1233		1330
1234	for (archetype at = (archetype )arch->more; at; at = (archetype *)at->more)	1331	for (archetype at = (archetype )arch->more; at; at = (archetype *)at->more)
1235	{	1332	{
1236	object *op = arch_to_object (at);	1333	object *op = at->instance ();
1237		1334
1238	op->name = name;	1335	op->name = name;
1239	op->name_pl = name_pl;	1336	op->name_pl = name_pl;
1240	op->title = title;	1337	op->title = title;
1241		1338
…		…
1279	* Passing 0 for flag gives proper default values, so flag really only needs	1376	* Passing 0 for flag gives proper default values, so flag really only needs
1280	* to be set if special handling is needed.	1377	* to be set if special handling is needed.
1281	*	1378	*
1282	* Return value:	1379	* Return value:
1283	* new object if 'op' was merged with other object	1380	* new object if 'op' was merged with other object
1284	* NULL if 'op' was destroyed	1381	* NULL if there was an error (destroyed, blocked etc.)
1285	* just 'op' otherwise	1382	* just 'op' otherwise
1286	*/	1383	*/
1287	object *	1384	object *
1288	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1385	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1289	{	1386	{
…		…
1326	// from here :/	1423	// from here :/
1327	op->nrof += tmp->nrof;	1424	op->nrof += tmp->nrof;
1328	tmp->destroy ();	1425	tmp->destroy ();
1329	}	1426	}
1330		1427
1331	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1428	op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1332	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1429	op->clr_flag (FLAG_INV_LOCKED);
1333		1430
1334	if (!QUERY_FLAG (op, FLAG_ALIVE))	1431	if (!op->flag [FLAG_ALIVE])
1335	CLEAR_FLAG (op, FLAG_NO_STEAL);	1432	op->clr_flag (FLAG_NO_STEAL);
1336		1433
1337	if (flag & INS_BELOW_ORIGINATOR)	1434	if (flag & INS_BELOW_ORIGINATOR)
1338	{	1435	{
1339	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y)	1436	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y)
1340	{	1437	{
…		…
1375	* when lots of spells are cast in one area. Currently, it is presumed	1472	* when lots of spells are cast in one area. Currently, it is presumed
1376	* that flying non pickable objects are spell objects.	1473	* that flying non pickable objects are spell objects.
1377	*/	1474	*/
1378	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1475	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1379	{	1476	{
1380	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))	1477	if (tmp->flag [FLAG_IS_FLOOR] \|\| tmp->flag [FLAG_OVERLAY_FLOOR])
1381	floor = tmp;	1478	floor = tmp;
1382		1479
1383	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1480	if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1384	{	1481	{
1385	/* We insert above top, so we want this object below this */	1482	/* We insert above top, so we want this object below this */
1386	top = tmp->below;	1483	top = tmp->below;
1387	break;	1484	break;
1388	}	1485	}
…		…
1406	&& (op->face && !faces [op->face].visibility))	1503	&& (op->face && !faces [op->face].visibility))
1407	{	1504	{
1408	object *last;	1505	object *last;
1409		1506
1410	for (last = top; last != floor; last = last->below)	1507	for (last = top; last != floor; last = last->below)
1411	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1508	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1412	break;	1509	break;
1413		1510
1414	/* Check to see if we found the object that blocks view,	1511	/* Check to see if we found the object that blocks view,
1415	* and make sure we have a below pointer for it so that	1512	* and make sure we have a below pointer for it so that
1416	* we can get inserted below this one, which requires we	1513	* we can get inserted below this one, which requires we
…		…
1489	*/	1586	*/
1490		1587
1491	/* if this is not the head or flag has been passed, don't check walk on status */	1588	/* if this is not the head or flag has been passed, don't check walk on status */
1492	if (!(flag & INS_NO_WALK_ON) && op->is_head ())	1589	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1493	{	1590	{
1494	if (check_move_on (op, originator))	1591	if (check_move_on (op, originator, flag))
1495	return 0;	1592	return 0;
1496		1593
1497	/* If we are a multi part object, lets work our way through the check	1594	/* If we are a multi part object, let's work our way through the check
1498	* walk on's.	1595	* walk on's.
1499	*/	1596	*/
1500	for (object *tmp = op->more; tmp; tmp = tmp->more)	1597	for (object *tmp = op->more; tmp; tmp = tmp->more)
1501	if (check_move_on (tmp, originator))	1598	if (check_move_on (tmp, originator, flag))
1502	return 0;	1599	return 0;
1503	}	1600	}
1504		1601
1505	return op;	1602	return op;
1506	}	1603	}
…		…
1516		1613
1517	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1614	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1518	if (tmp->arch->archname == archname) /* same archetype */	1615	if (tmp->arch->archname == archname) /* same archetype */
1519	tmp->destroy ();	1616	tmp->destroy ();
1520		1617
1521	object *tmp = arch_to_object (archetype::find (archname));	1618	object *tmp = archetype::find (archname)->instance ();
1522		1619
1523	tmp->x = op->x;	1620	tmp->x = op->x;
1524	tmp->y = op->y;	1621	tmp->y = op->y;
1525		1622
1526	insert_ob_in_map (tmp, op->map, op, 0);	1623	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1531	{	1628	{
1532	if (where->env)	1629	if (where->env)
1533	return where->env->insert (this);	1630	return where->env->insert (this);
1534	else	1631	else
1535	return where->map->insert (this, where->x, where->y, originator, flags);	1632	return where->map->insert (this, where->x, where->y, originator, flags);
		1633	}
		1634
		1635	// check whether we can put this into the map, respect max_volume, max_items
		1636	bool
		1637	object::can_drop_at (maptile m, int x, int y, object originator)
		1638	{
		1639	mapspace &ms = m->at (x, y);
		1640
		1641	int items = ms.items ();
		1642
		1643	if (!items // testing !items ensures we can drop at least one item
		1644	\|\| (items < m->max_items
		1645	&& ms.volume () < m->max_volume))
		1646	return true;
		1647
		1648	if (originator && originator->is_player ())
		1649	originator->contr->failmsgf (
		1650	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1651	query_name ()
		1652	);
		1653
		1654	return false;
1536	}	1655	}
1537		1656
1538	/*	1657	/*
1539	* decrease(object, number) decreases a specified number from	1658	* decrease(object, number) decreases a specified number from
1540	* the amount of an object. If the amount reaches 0, the object	1659	* the amount of an object. If the amount reaches 0, the object
…		…
1550		1669
1551	nr = min (nr, nrof);	1670	nr = min (nr, nrof);
1552		1671
1553	if (nrof > nr)	1672	if (nrof > nr)
1554	{	1673	{
		1674	sint64 oweight = total_weight ();
		1675
1555	nrof -= nr;	1676	nrof -= nr;
1556	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1557		1677
1558	if (object *pl = visible_to ())	1678	if (object *pl = visible_to ())
1559	esrv_update_item (UPD_NROF, pl, this);	1679	esrv_update_item (UPD_NROF, pl, this);
		1680
		1681	adjust_weight (env, oweight, total_weight ());
1560		1682
1561	return true;	1683	return true;
1562	}	1684	}
1563	else	1685	else
1564	{	1686	{
…		…
1639	if (op->nrof)	1761	if (op->nrof)
1640	for (object *tmp = inv; tmp; tmp = tmp->below)	1762	for (object *tmp = inv; tmp; tmp = tmp->below)
1641	if (object::can_merge (tmp, op))	1763	if (object::can_merge (tmp, op))
1642	{	1764	{
1643	/* return the original object and remove inserted object	1765	/* return the original object and remove inserted object
1644	(client needs the original object) */	1766	(client prefers the original object) */
		1767
		1768	// carring must be 0 for mergable objects
		1769	sint64 oweight = tmp->weight * tmp->nrof;
		1770
1645	tmp->nrof += op->nrof;	1771	tmp->nrof += op->nrof;
1646		1772
1647	if (object *pl = tmp->visible_to ())	1773	if (object *pl = tmp->visible_to ())
1648	esrv_update_item (UPD_NROF, pl, tmp);	1774	esrv_update_item (UPD_NROF, pl, tmp);
1649		1775
1650	adjust_weight (this, op->total_weight ());	1776	adjust_weight (this, oweight, tmp->weight * tmp->nrof);
1651		1777
1652	op->destroy ();	1778	op->destroy ();
1653	op = tmp;	1779	op = tmp;
1654	goto inserted;	1780	goto inserted;
1655	}	1781	}
…		…
1671	op->flag [FLAG_REMOVED] = 0;	1797	op->flag [FLAG_REMOVED] = 0;
1672		1798
1673	if (object *pl = op->visible_to ())	1799	if (object *pl = op->visible_to ())
1674	esrv_send_item (pl, op);	1800	esrv_send_item (pl, op);
1675		1801
1676	adjust_weight (this, op->total_weight ());	1802	adjust_weight (this, 0, op->total_weight ());
1677		1803
1678	inserted:	1804	inserted:
1679	/* reset the light list and los of the players on the map */	1805	/* reset the light list and los of the players on the map */
1680	if (op->glow_radius && is_on_map ())	1806	if (op->glow_radius && is_on_map ())
1681	{	1807	{
1682	update_stats ();	1808	update_stats ();
1683	update_all_los (map, x, y);	1809	update_all_los (map, x, y);
1684	}	1810	}
1685	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])	1811	else if (is_player ())
1686	// if this is a player's inventory, update stats	1812	// if this is a player's inventory, update stats
1687	update_stats ();	1813	contr->queue_stats_update ();
1688		1814
1689	INVOKE_OBJECT (INSERT, this);	1815	INVOKE_OBJECT (INSERT, this);
1690		1816
1691	return op;	1817	return op;
1692	}	1818	}
…		…
1710	* MSW 2001-07-08: Check all objects on space, not just those below	1836	* MSW 2001-07-08: Check all objects on space, not just those below
1711	* object being inserted. insert_ob_in_map may not put new objects	1837	* object being inserted. insert_ob_in_map may not put new objects
1712	* on top.	1838	* on top.
1713	*/	1839	*/
1714	int	1840	int
1715	check_move_on (object op, object originator)	1841	check_move_on (object op, object originator, int flags)
1716	{	1842	{
1717	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1843	if (op->flag [FLAG_NO_APPLY])
1718	return 0;	1844	return 0;
1719		1845
1720	object *tmp;	1846	object *tmp;
1721	maptile *m = op->map;	1847	maptile *m = op->map;
1722	int x = op->x, y = op->y;	1848	int x = op->x, y = op->y;
…		…
1759	* Second check makes sure that the movement types not being slowed	1885	* Second check makes sure that the movement types not being slowed
1760	* (~slow_move) is not blocked on this space - just because the	1886	* (~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	1887	* 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.	1888	* swim on that space, can't use it to avoid the penalty.
1763	*/	1889	*/
1764	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1890	if (!op->flag [FLAG_WIZPASS])
1765	{	1891	{
1766	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1892	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))	1893	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1768	{	1894	{
1769	float diff = tmp->move_slow_penalty * fabs (op->speed);	1895	float diff = tmp->move_slow_penalty * fabs (op->speed);
…		…
1779		1905
1780	/* Basically same logic as above, except now for actual apply. */	1906	/* Basically same logic as above, except now for actual apply. */
1781	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|	1907	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|
1782	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1908	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1783	{	1909	{
		1910	if ((flags & INS_NO_AUTO_EXIT)
		1911	&& (tmp->type == EXIT \|\| tmp->type == TELEPORTER
		1912	\|\| tmp->type == HOLE \|\| tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead
		1913	continue;
		1914
1784	move_apply (tmp, op, originator);	1915	move_apply (tmp, op, originator);
1785		1916
1786	if (op->destroyed ())	1917	if (op->destroyed ())
1787	return 1;	1918	return 1;
1788		1919
…		…
1900	void	2031	void
1901	flag_inv (object *op, int flag)	2032	flag_inv (object *op, int flag)
1902	{	2033	{
1903	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2034	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1904	{	2035	{
1905	SET_FLAG (tmp, flag);	2036	tmp->set_flag (flag);
1906	flag_inv (tmp, flag);	2037	flag_inv (tmp, flag);
1907	}	2038	}
1908	}	2039	}
1909		2040
1910	/*	2041	/*
…		…
1913	void	2044	void
1914	unflag_inv (object *op, int flag)	2045	unflag_inv (object *op, int flag)
1915	{	2046	{
1916	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2047	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1917	{	2048	{
1918	CLEAR_FLAG (tmp, flag);	2049	tmp->clr_flag (flag);
1919	unflag_inv (tmp, flag);	2050	unflag_inv (tmp, flag);
1920	}	2051	}
1921	}	2052	}
1922		2053
1923	/*	2054	/*
…		…
2113	{	2244	{
2114	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2245	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2115	}	2246	}
2116		2247
2117	/*	2248	/*
2118	* find_dir_2(delta-x,delta-y) will return a direction in which	2249	* find_dir_2(delta-x,delta-y) will return a direction value
2119	* an object which has subtracted the x and y coordinates of another	2250	* for running into direct [dx, dy].
2120	* object, needs to travel toward it.	2251	* (the opposite of crossfire's find_dir_2!)
2121	*/	2252	*/
2122	int	2253	int
2123	find_dir_2 (int x, int y)	2254	find_dir_2 (int x, int y)
2124	{	2255	{
		2256	#if 1 // new algorithm
		2257	// this works by putting x, y into 16 sectors, which
		2258	// are not equal sized, but are a better approximation
		2259	// then the old algorithm, and then using a mapping
		2260	// table to map it into a direction value.
		2261	// basically, it maps these comparisons to each bit
		2262	// bit #3: x < 0
		2263	// bit #2: y < 0
		2264	// bit #1: x > y
		2265	// bit #0: x > 2y
		2266
		2267	static const uint8 dir[16] = {
		2268	4, 5, 4, 3,
		2269	2, 1, 2, 3,
		2270	6, 5, 6, 7,
		2271	8, 1, 8, 7,
		2272	};
		2273	int sector = 0;
		2274
		2275	// this is a bit ugly, but more likely to result in branchless code
		2276	sector \|= x < 0 ? 8 : 0;
		2277	x = x < 0 ? -x : x; // abs
		2278
		2279	sector \|= y < 0 ? 4 : 0;
		2280	y = y < 0 ? -y : y; // abs
		2281
		2282	if (x > y)
		2283	{
		2284	sector \|= 2;
		2285
		2286	if (x > y * 2)
		2287	sector \|= 1;
		2288	}
		2289	else
		2290	{
		2291	if (y > x * 2)
		2292	sector \|= 1;
		2293	else if (!y)
		2294	return 0; // x == 0 here
		2295	}
		2296
		2297	return dir [sector];
		2298	#else // old algorithm
2125	int q;	2299	int q;
2126		2300
2127	if (y)	2301	if (y)
2128	q = x * 100 / y;	2302	q = 128 * x / y;
2129	else if (x)	2303	else if (x)
2130	q = -300 * x;	2304	q = -512 * x; // to make it > 309
2131	else	2305	else
2132	return 0;	2306	return 0;
2133		2307
2134	if (y > 0)	2308	if (y > 0)
2135	{	2309	{
2136	if (q < -242)	2310	if (q < -309) return 7;
		2311	if (q < -52) return 6;
		2312	if (q < 52) return 5;
		2313	if (q < 309) return 4;
		2314
2137	return 3;	2315	return 3;
2138	if (q < -41)	2316	}
2139	return 2;	2317	else
2140	if (q < 41)	2318	{
2141	return 1;	2319	if (q < -309) return 3;
2142	if (q < 242)	2320	if (q < -52) return 2;
2143	return 8;	2321	if (q < 52) return 1;
		2322	if (q < 309) return 8;
		2323
2144	return 7;	2324	return 7;
2145	}	2325	}
2146		2326	#endif
2147	if (q < -242)
2148	return 7;
2149	if (q < -41)
2150	return 6;
2151	if (q < 41)
2152	return 5;
2153	if (q < 242)
2154	return 4;
2155
2156	return 3;
2157	}	2327	}
2158		2328
2159	/*	2329	/*
2160	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2330	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2161	* between two directions (which are expected to be absolute (see absdir())	2331	* between two directions (which are expected to be absolute (see absdir())
2162	*/	2332	*/
2163	int	2333	int
2164	dirdiff (int dir1, int dir2)	2334	dirdiff (int dir1, int dir2)
2165	{	2335	{
2166	int d;
2167
2168	d = abs (dir1 - dir2);	2336	int d = abs (dir1 - dir2);
2169	if (d > 4)
2170	d = 8 - d;
2171		2337
2172	return d;	2338	return d > 4 ? 8 - d : d;
2173	}	2339	}
2174		2340
2175	/* peterm:	2341	/* peterm:
2176	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2342	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2177	* Basically, this is a table of directions, and what directions	2343	* Basically, this is a table of directions, and what directions
…		…
2179	* This basically means that if direction is 15, then it could either go	2345	* 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.	2346	* 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	2347	* Moved from spell_util.c to object.c with the other related direction
2182	* functions.	2348	* functions.
2183	*/	2349	*/
2184	const int reduction_dir[SIZEOFFREE][3] = {	2350	static const int reduction_dir[SIZEOFFREE][3] = {
2185	{0, 0, 0}, /* 0 */	2351	{0, 0, 0}, /* 0 */
2186	{0, 0, 0}, /* 1 */	2352	{0, 0, 0}, /* 1 */
2187	{0, 0, 0}, /* 2 */	2353	{0, 0, 0}, /* 2 */
2188	{0, 0, 0}, /* 3 */	2354	{0, 0, 0}, /* 3 */
2189	{0, 0, 0}, /* 4 */	2355	{0, 0, 0}, /* 4 */
…		…
2283	* Add a check so we can't pick up invisible objects (0.93.8)	2449	* Add a check so we can't pick up invisible objects (0.93.8)
2284	*/	2450	*/
2285	int	2451	int
2286	can_pick (const object who, const object item)	2452	can_pick (const object who, const object item)
2287	{	2453	{
2288	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2454	return /who->flag [FLAG_WIZ]\|\| /
2289	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2455	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2290	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));	2456	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2291	}	2457	}
2292		2458
2293	/*	2459	/*
2294	* create clone from object to another	2460	* create clone from object to another
2295	*/	2461	*/
…		…
2460	{	2626	{
2461	return map ? map->region (x, y)	2627	return map ? map->region (x, y)
2462	: region::default_region ();	2628	: region::default_region ();
2463	}	2629	}
2464		2630
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	2631	void
2475	object::open_container (object *new_container)	2632	object::open_container (object *new_container)
2476	{	2633	{
2477	if (container == new_container)	2634	if (container == new_container)
2478	return;	2635	return;
…		…
2512	// TODO: this does not seem to serve any purpose anymore?	2669	// TODO: this does not seem to serve any purpose anymore?
2513	#if 0	2670	#if 0
2514	// insert the "Close Container" object.	2671	// insert the "Close Container" object.
2515	if (archetype *closer = new_container->other_arch)	2672	if (archetype *closer = new_container->other_arch)
2516	{	2673	{
2517	object *closer = arch_to_object (new_container->other_arch);	2674	object *closer = new_container->other_arch->instance ();
2518	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2675	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2519	new_container->insert (closer);	2676	new_container->insert (closer);
2520	}	2677	}
2521	#endif	2678	#endif
2522		2679
…		…
2548	return splay (tmp);	2705	return splay (tmp);
2549		2706
2550	return 0;	2707	return 0;
2551	}	2708	}
2552		2709
		2710	//-GPL
		2711
2553	void	2712	void
2554	object::force_set_timer (int duration)	2713	object::force_set_timer (int duration)
2555	{	2714	{
2556	this->duration = 1;	2715	this->duration = 1;
2557	this->speed_left = -1.f;	2716	this->speed_left = -1.f;
…		…
2566	force->destroy ();	2725	force->destroy ();
2567		2726
2568	object *force = get_archetype (FORCE_NAME);	2727	object *force = get_archetype (FORCE_NAME);
2569		2728
2570	force->slaying = name;	2729	force->slaying = name;
2571
2572	force->force_set_timer (duration);	2730	force->force_set_timer (duration);
2573
2574	force->flag [FLAG_APPLIED] = true;	2731	force->flag [FLAG_APPLIED] = true;
2575		2732
2576	return insert (force);	2733	return insert (force);
2577	}	2734	}
2578		2735
2579	void	2736	void
…		…
2628		2785
2629	insert (force);	2786	insert (force);
2630	}	2787	}
2631	}	2788	}
2632		2789
		2790	void object::change_move_type (MoveType mt)
		2791	{
		2792	if (move_type == mt)
		2793	return;
		2794
		2795	if (is_on_map ())
		2796	{
		2797	// we are on the map, so handle move_on/off effects
		2798	remove ();
		2799	move_type = mt;
		2800	map->insert (this, x, y, this);
		2801	}
		2802	else
		2803	move_type = mt;
		2804	}
		2805
		2806	/* object should be a player.
		2807	* we return the object the player has marked with the 'mark' command
		2808	* below. If no match is found (or object has changed), we return
		2809	* NULL. We leave it up to the calling function to print messages if
		2810	* nothing is found.
		2811	*/
		2812	object *
		2813	object::mark () const
		2814	{
		2815	if (contr && contr->mark && contr->mark->env == this)
		2816	return contr->mark;
		2817	else
		2818	return 0;
		2819	}
		2820

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.291 by root, Mon Oct 12 14:00:57 2009 UTC vs. Revision 1.339 by root, Fri Jul 2 17:39:23 2010 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.291 by root, Mon Oct 12 14:00:57 2009 UTC vs.
Revision 1.339 by root, Fri Jul 2 17:39:23 2010 UTC