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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.309 by root, Sun Nov 29 17:41:07 2009 UTC vs.
Revision 1.337 by root, Thu May 6 21:45:49 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;
42		47
43	//+GPL	48	//+GPL
44		49
45	short freearr_x[SIZEOFFREE] = {	50	short freearr_x[SIZEOFFREE] = {
46	0,	51	0,
…		…
248	* Improvements made with merge: Better checking on potion, and also	253	* Improvements made with merge: Better checking on potion, and also
249	* check weight	254	* check weight
250	*/	255	*/
251	bool object::can_merge_slow (object ob1, object ob2)	256	bool object::can_merge_slow (object ob1, object ob2)
252	{	257	{
253	/* A couple quicksanity checks */	258	/* A couple quick sanity checks */
254	if (ob1 == ob2	259	if (ob1 == ob2
255	\|\| ob1->type != ob2->type	260	\|\| ob1->type != ob2->type
256	\|\| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED
257	\|\| ob1->value != ob2->value	261	\|\| ob1->value != ob2->value
258	\|\| ob1->name != ob2->name)	262	\|\| ob1->name != ob2->name
		263	\|\| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
259	return 0;	264	return 0;
260		265
261	/* Do not merge objects if nrof would overflow, assume nrof	266	/* Do not merge objects if nrof would overflow, assume nrof
262	* is always 0 .. 2*31-1 /	267	* is always 0 .. 2*31-1 /
263	if (ob1->nrof > 0x7fffffff - ob2->nrof)	268	if (ob1->nrof > 0x7fffffff - ob2->nrof)
…		…
267	* 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
268	* 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
269	* 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
270	* flags lose any meaning.	275	* flags lose any meaning.
271	*/	276	*/
272	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	277	if (ob1->flag [FLAG_IDENTIFIED])
273	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	278	ob1->set_flag (FLAG_BEEN_APPLIED);
274		279
275	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	280	if (ob2->flag [FLAG_IDENTIFIED])
276	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	281	ob2->set_flag (FLAG_BEEN_APPLIED);
277		282
278	if (ob1->arch->archname != ob2->arch->archname	283	if (ob1->arch->archname != ob2->arch->archname
279	\|\| ob1->name != ob2->name	284	\|\| ob1->name != ob2->name
280	\|\| ob1->title != ob2->title	285	\|\| ob1->title != ob2->title
281	\|\| ob1->msg != ob2->msg	286	\|\| ob1->msg != ob2->msg
…		…
284	\|\| ob1->magic != ob2->magic	289	\|\| ob1->magic != ob2->magic
285	\|\| ob1->slaying != ob2->slaying	290	\|\| ob1->slaying != ob2->slaying
286	\|\| ob1->skill != ob2->skill	291	\|\| ob1->skill != ob2->skill
287	\|\| ob1->value != ob2->value	292	\|\| ob1->value != ob2->value
288	\|\| ob1->animation_id != ob2->animation_id	293	\|\| ob1->animation_id != ob2->animation_id
289	\|\| (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
290	\|\| ob1->client_type != ob2->client_type	295	\|\| ob1->client_type != ob2->client_type
291	\|\| ob1->material != ob2->material	296	\|\| ob1->material != ob2->material
292	\|\| ob1->lore != ob2->lore	297	\|\| ob1->lore != ob2->lore
293	\|\| ob1->subtype != ob2->subtype	298	\|\| ob1->subtype != ob2->subtype
294	\|\| ob1->move_type != ob2->move_type	299	\|\| ob1->move_type != ob2->move_type
…		…
330		335
331	/* 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,
332	* 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
333	* some items equipped, and we don't want those to merge.	338	* some items equipped, and we don't want those to merge.
334	*/	339	*/
335	if (QUERY_FLAG (ob1, FLAG_APPLIED) \|\| QUERY_FLAG (ob2, FLAG_APPLIED))	340	if (ob1->flag [FLAG_APPLIED] \|\| ob2->flag [FLAG_APPLIED])
336	return 0;	341	return 0;
337		342
338	/* 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
339	* 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
340	* check?	345	* check?
341	*/	346	*/
342	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())	347	if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
343	return 0;	348	return 0;
344		349
345	switch (ob1->type)	350	switch (ob1->type)
346	{	351	{
347	case SCROLL:	352	case SCROLL:
…		…
421		426
422	return 0;	427	return 0;
423	}	428	}
424		429
425	// adjust weight per container type ("of holding")	430	// adjust weight per container type ("of holding")
426	static sint32	431	static uint32
427	weight_adjust_for (object *op, sint32 weight)	432	weight_adjust_for (object *op, uint32 weight)
428	{	433	{
429	return op->type == CONTAINER	434	return op->type == CONTAINER
430	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	435	? weight - weight * op->stats.Str / 100
431	: weight;	436	: weight;
432	}	437	}
433		438
434	/*	439	/*
435	* adjust_weight(object, weight) adds the specified weight to an object,	440	* subtracts, then adds, the specified weight to an object,
436	* and also updates how much the environment(s) is/are carrying.	441	* and also updates how much the environment(s) is/are carrying.
437	*/	442	*/
438	static void	443	static void
439	adjust_weight (object *op, sint32 weight)	444	adjust_weight (object *op, sint32 sub, sint32 add)
440	{	445	{
441	while (op)	446	while (op)
442	{	447	{
443	// adjust by actual difference to account for rounding errors	448	sint32 ocarrying = op->carrying;
444	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
445	weight = weight_adjust_for (op, op->carrying)
446	- weight_adjust_for (op, op->carrying - weight);
447		449
448	if (!weight)	450	op->carrying -= weight_adjust_for (op, sub);
449	return;	451	op->carrying += weight_adjust_for (op, add);
450
451	op->carrying += weight;
452		452
453	if (object *pl = op->visible_to ())	453	if (object *pl = op->visible_to ())
454	if (pl != op) // player is handled lazily	454	if (pl != op) // player is handled lazily
455	esrv_update_item (UPD_WEIGHT, pl, op);	455	esrv_update_item (UPD_WEIGHT, pl, op);
456		456
		457	sub = ocarrying;
		458	add = op->carrying;
		459
457	op = op->env;	460	op = op->env;
458	}	461	}
459	}	462	}
460		463
461	/*	464	/*
…		…
468	{	471	{
469	sint32 sum = 0;	472	sint32 sum = 0;
470		473
471	for (object *op = inv; op; op = op->below)	474	for (object *op = inv; op; op = op->below)
472	{	475	{
473	if (op->inv)
474	op->update_weight ();	476	op->update_weight ();
475		477
476	sum += op->total_weight ();	478	sum += weight_adjust_for (this, op->total_weight ());
477	}	479	}
478
479	sum = weight_adjust_for (this, sum);
480		480
481	if (sum != carrying)	481	if (sum != carrying)
482	{	482	{
		483	if (carrying != sum && carrying)//D
		484	LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n",
		485	(long long)sum, (long long)carrying, debug_desc ());
		486
483	carrying = sum;	487	carrying = sum;
484		488
485	if (object *pl = visible_to ())	489	if (object *pl = visible_to ())
486	if (pl != this) // player is handled lazily	490	if (pl != this) // player is handled lazily
487	esrv_update_item (UPD_WEIGHT, pl, this);	491	esrv_update_item (UPD_WEIGHT, pl, this);
…		…
515	object *	519	object *
516	find_object (tag_t i)	520	find_object (tag_t i)
517	{	521	{
518	for_all_objects (op)	522	for_all_objects (op)
519	if (op->count == i)	523	if (op->count == i)
		524	return op;
		525
		526	return 0;
		527	}
		528
		529	/*
		530	* Returns the object which has the uuid equal to the argument.
		531	* MOAR VERRRY slow.
		532	*/
		533
		534	object *
		535	find_object_uuid (UUID i)
		536	{
		537	for_all_objects (op)
		538	if (op->uuid == i)
520	return op;	539	return op;
521		540
522	return 0;	541	return 0;
523	}	542	}
524		543
…		…
558	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());	577	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
559	return;	578	return;
560	}	579	}
561		580
562	this->owner = owner;	581	this->owner = owner;
563	}
564
565	int
566	object::slottype () const
567	{
568	if (type == SKILL)
569	{
570	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
571	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
572	}
573	else
574	{
575	if (slot [body_combat].info) return slot_combat;
576	if (slot [body_range ].info) return slot_ranged;
577	}
578
579	return slot_none;
580	}
581
582	bool
583	object::change_weapon (object *ob)
584	{
585	if (current_weapon == ob)
586	return true;
587
588	if (chosen_skill)
589	chosen_skill->flag [FLAG_APPLIED] = false;
590
591	current_weapon = ob;
592	chosen_skill = !ob \|\| ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
593
594	if (chosen_skill)
595	chosen_skill->flag [FLAG_APPLIED] = true;
596
597	update_stats ();
598
599	if (ob)
600	{
601	// now check wether any body locations became invalid, in which case
602	// we cannot apply the weapon at the moment.
603	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
604	if (slot[i].used < 0)
605	{
606	current_weapon = chosen_skill = 0;
607	update_stats ();
608
609	new_draw_info_format (NDI_UNIQUE, 0, this,
610	"You try to balance all your items at once, "
611	"but the %s is just too much for your body. "
612	"[You need to unapply some items first - use the 'body' command to see "
613	"how many items you cna wera on a specific body part.]", &ob->name);
614	return false;
615	}
616
617	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
618	}
619	else
620	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
621
622	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
623	{
624	LOG (llevError \| logBacktrace, "%s changed to unapplied weapon %s",
625	&name, ob->debug_desc ());
626	return false;
627	}
628
629	return true;
630	}	582	}
631		583
632	/* Zero the key_values on op, decrementing the shared-string	584	/* Zero the key_values on op, decrementing the shared-string
633	* refcounts and freeing the links.	585	* refcounts and freeing the links.
634	*/	586	*/
…		…
736	* be called to update the face variable, _and_ how it looks on the map.	688	* be called to update the face variable, _and_ how it looks on the map.
737	*/	689	*/
738	void	690	void
739	update_turn_face (object *op)	691	update_turn_face (object *op)
740	{	692	{
741	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) \|\| !op->arch)	693	if (!op->flag [FLAG_IS_TURNABLE] \|\| !op->arch)
742	return;	694	return;
743		695
744	SET_ANIMATION (op, op->direction);	696	SET_ANIMATION (op, op->direction);
745	update_object (op, UP_OBJ_FACE);	697	update_object (op, UP_OBJ_FACE);
746	}	698	}
…		…
812	/* nop */;	764	/* nop */;
813	else if (action == UP_OBJ_INSERT)	765	else if (action == UP_OBJ_INSERT)
814	{	766	{
815	#if 0	767	#if 0
816	// this is likely overkill, TODO: revisit (schmorp)	768	// this is likely overkill, TODO: revisit (schmorp)
817	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	769	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
818	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	770	\|\| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
819	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))	771	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
820	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	772	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
821	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	773	\|\| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
822	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	774	\|\| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
823	\|\| (m.move_on \| op->move_on ) != m.move_on	775	\|\| (m.move_on \| op->move_on ) != m.move_on
824	\|\| (m.move_off \| op->move_off ) != m.move_off	776	\|\| (m.move_off \| op->move_off ) != m.move_off
825	\|\| (m.move_slow \| op->move_slow) != m.move_slow	777	\|\| (m.move_slow \| op->move_slow) != m.move_slow
826	/* This isn't perfect, but I don't expect a lot of objects to	778	/* This isn't perfect, but I don't expect a lot of objects to
827	* have move_allow right now.	779	* have move_allow right now.
…		…
848	update_object (op->more, action);	800	update_object (op->more, action);
849	}	801	}
850		802
851	object::object ()	803	object::object ()
852	{	804	{
853	SET_FLAG (this, FLAG_REMOVED);	805	this->set_flag (FLAG_REMOVED);
854		806
855	//expmul = 1.0; declared const for the time being	807	//expmul = 1.0; declared const for the time being
856	face = blank_face;	808	face = blank_face;
857	material = MATERIAL_NULL;	809	material = MATERIAL_NULL;
858	}	810	}
…		…
862	unlink ();	814	unlink ();
863		815
864	free_key_values (this);	816	free_key_values (this);
865	}	817	}
866		818
867	static int object_count;
868
869	void object::link ()	819	void object::link ()
870	{	820	{
871	assert (!index);//D	821	assert (!index);//D
872	uuid = UUID::gen ();	822	uuid = UUID::gen ();
873	count = ++object_count;
874		823
875	refcnt_inc ();	824	refcnt_inc ();
876	objects.insert (this);	825	objects.insert (this);
		826
		827	++create_count;
		828
877	}	829	}
878		830
879	void object::unlink ()	831	void object::unlink ()
880	{	832	{
881	if (!index)	833	if (!index)
882	return;	834	return;
		835
		836	++destroy_count;
883		837
884	objects.erase (this);	838	objects.erase (this);
885	refcnt_dec ();	839	refcnt_dec ();
886	}	840	}
887		841
…		…
992	map->insert (op, x, y);	946	map->insert (op, x, y);
993	}	947	}
994	}	948	}
995	}	949	}
996		950
		951	/*
		952	* Remove and free all objects in the inventory of the given object.
		953	* Unlike destroy_inv, this assumes the *this is destroyed as well
		954	* well, so we can (and have to!) take shortcuts.
		955	*/
		956	void
		957	object::destroy_inv_fast ()
		958	{
		959	while (object *op = inv)
		960	{
		961	// remove from object the fast way
		962	op->flag [FLAG_REMOVED] = true;
		963	op->env = 0;
		964	if ((inv = inv->below))
		965	inv->above = 0;
		966
		967	// then destroy
		968	op->destroy ();
		969	}
		970	}
		971
		972	void
		973	object::freelist_free (int count)
		974	{
		975	while (count-- && freelist)
		976	{
		977	freelist_item *next = freelist->next;
		978	// count is being "destroyed"
		979
		980	sfree ((char *)freelist, sizeof (object));
		981
		982	freelist = next;
		983	--free_count;
		984	}
		985	}
		986
		987	object *
997	object *object::create ()	988	object::create ()
998	{	989	{
999	object *op = new object;	990	object *op;
		991
		992	if (freelist)
		993	{
		994	freelist_item li = *freelist;
		995	memset (freelist, 0, sizeof (object));
		996
		997	op = new (freelist) object;
		998	op->count = li.count;
		999
		1000	freelist = li.next;
		1001	--free_count;
		1002	}
		1003	else
		1004	{
		1005	void *ni = salloc0<char> (sizeof (object));
		1006
		1007	op = new(ni) object;
		1008
		1009	op->count = ++object_count;
		1010	}
		1011
1000	op->link ();	1012	op->link ();
		1013
1001	return op;	1014	return op;
1002	}	1015	}
1003		1016
		1017	void
		1018	object::do_delete ()
		1019	{
		1020	uint32_t count = this->count;
		1021
		1022	this->~object ();
		1023
		1024	freelist_item li = (freelist_item )this;
		1025	li->next = freelist;
		1026	li->count = count;
		1027
		1028	freelist = li;
		1029	++free_count;
		1030	}
		1031
1004	static struct freed_map : maptile	1032	static struct freed_map : maptile
1005	{	1033	{
1006	freed_map ()	1034	freed_map ()
		1035	: maptile (3, 3)
1007	{	1036	{
1008	path = "<freed objects map>";	1037	path = "<freed objects map>";
1009	name = "/internal/freed_objects_map";	1038	name = "/internal/freed_objects_map";
1010	width = 3;
1011	height = 3;
1012	no_drop = 1;	1039	no_drop = 1;
1013	no_reset = 1;	1040	no_reset = 1;
1014		1041
1015	alloc ();
1016	in_memory = MAP_ACTIVE;	1042	in_memory = MAP_ACTIVE;
1017	}	1043	}
1018		1044
1019	~freed_map ()	1045	~freed_map ()
1020	{	1046	{
…		…
1071	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1097	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1072	head->destroy ();	1098	head->destroy ();
1073	return;	1099	return;
1074	}	1100	}
1075		1101
1076	destroy_inv (false);	1102	destroy_inv_fast ();
1077		1103
1078	if (is_head ())	1104	if (is_head ())
1079	if (sound_destroy)	1105	if (sound_destroy)
1080	play_sound (sound_destroy);	1106	play_sound (sound_destroy);
1081	else if (flag [FLAG_MONSTER])	1107	else if (flag [FLAG_MONSTER])
…		…
1113	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed	1139	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1114	if (object *pl = visible_to ())	1140	if (object *pl = visible_to ())
1115	esrv_del_item (pl->contr, count);	1141	esrv_del_item (pl->contr, count);
1116	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1142	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1117		1143
1118	adjust_weight (env, -total_weight ());	1144	adjust_weight (env, total_weight (), 0);
1119		1145
1120	object *pl = in_player ();	1146	object *pl = in_player ();
1121		1147
1122	/* we set up values so that it could be inserted into	1148	/* we set up values so that it could be inserted into
1123	* the map, but we don't actually do that - it is up	1149	* the map, but we don't actually do that - it is up
…		…
1135	below = 0;	1161	below = 0;
1136	env = 0;	1162	env = 0;
1137		1163
1138	if (pl && pl->is_player ())	1164	if (pl && pl->is_player ())
1139	{	1165	{
		1166	if (expect_false (pl->contr->combat_ob == this))
		1167	{
		1168	pl->apply (pl->contr->combat_ob, AP_UNAPPLY);
		1169	pl->contr->combat_ob = 0;
		1170	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
		1171	}
		1172
		1173	if (expect_false (pl->contr->ranged_ob == this))
		1174	{
		1175	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY);
		1176	pl->contr->ranged_ob = 0;
		1177	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
		1178	}
		1179
1140	pl->contr->queue_stats_update ();	1180	pl->contr->queue_stats_update ();
1141		1181
1142	if (glow_radius && pl->is_on_map ())	1182	if (expect_false (glow_radius) && pl->is_on_map ())
1143	update_all_los (pl->map, pl->x, pl->y);	1183	update_all_los (pl->map, pl->x, pl->y);
1144	}	1184	}
1145	}	1185	}
1146	else if (map)	1186	else if (map)
1147	{	1187	{
…		…
1167	else if (pl->container_ () == this)	1207	else if (pl->container_ () == this)
1168	{	1208	{
1169	// removing a container should close it	1209	// removing a container should close it
1170	close_container ();	1210	close_container ();
1171	}	1211	}
1172		1212	else
1173	esrv_del_item (pl->contr, count);	1213	esrv_del_item (pl->contr, count);
1174	}	1214	}
1175		1215
1176	/* link the object above us */	1216	/* link the object above us */
1177	// re-link, make sure compiler can easily use cmove	1217	// re-link, make sure compiler can easily use cmove
1178	*(above ? &above->below : &ms.top) = below;	1218	*(above ? &above->below : &ms.top) = below;
…		…
1317	* Passing 0 for flag gives proper default values, so flag really only needs	1357	* Passing 0 for flag gives proper default values, so flag really only needs
1318	* to be set if special handling is needed.	1358	* to be set if special handling is needed.
1319	*	1359	*
1320	* Return value:	1360	* Return value:
1321	* new object if 'op' was merged with other object	1361	* new object if 'op' was merged with other object
1322	* NULL if 'op' was destroyed	1362	* NULL if there was an error (destroyed, blocked etc.)
1323	* just 'op' otherwise	1363	* just 'op' otherwise
1324	*/	1364	*/
1325	object *	1365	object *
1326	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1366	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1327	{	1367	{
…		…
1364	// from here :/	1404	// from here :/
1365	op->nrof += tmp->nrof;	1405	op->nrof += tmp->nrof;
1366	tmp->destroy ();	1406	tmp->destroy ();
1367	}	1407	}
1368		1408
1369	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1409	op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1370	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1410	op->clr_flag (FLAG_INV_LOCKED);
1371		1411
1372	if (!QUERY_FLAG (op, FLAG_ALIVE))	1412	if (!op->flag [FLAG_ALIVE])
1373	CLEAR_FLAG (op, FLAG_NO_STEAL);	1413	op->clr_flag (FLAG_NO_STEAL);
1374		1414
1375	if (flag & INS_BELOW_ORIGINATOR)	1415	if (flag & INS_BELOW_ORIGINATOR)
1376	{	1416	{
1377	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y)	1417	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y)
1378	{	1418	{
…		…
1413	* when lots of spells are cast in one area. Currently, it is presumed	1453	* when lots of spells are cast in one area. Currently, it is presumed
1414	* that flying non pickable objects are spell objects.	1454	* that flying non pickable objects are spell objects.
1415	*/	1455	*/
1416	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1456	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1417	{	1457	{
1418	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))	1458	if (tmp->flag [FLAG_IS_FLOOR] \|\| tmp->flag [FLAG_OVERLAY_FLOOR])
1419	floor = tmp;	1459	floor = tmp;
1420		1460
1421	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1461	if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1422	{	1462	{
1423	/* We insert above top, so we want this object below this */	1463	/* We insert above top, so we want this object below this */
1424	top = tmp->below;	1464	top = tmp->below;
1425	break;	1465	break;
1426	}	1466	}
…		…
1444	&& (op->face && !faces [op->face].visibility))	1484	&& (op->face && !faces [op->face].visibility))
1445	{	1485	{
1446	object *last;	1486	object *last;
1447		1487
1448	for (last = top; last != floor; last = last->below)	1488	for (last = top; last != floor; last = last->below)
1449	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1489	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1450	break;	1490	break;
1451		1491
1452	/* Check to see if we found the object that blocks view,	1492	/* Check to see if we found the object that blocks view,
1453	* and make sure we have a below pointer for it so that	1493	* and make sure we have a below pointer for it so that
1454	* we can get inserted below this one, which requires we	1494	* we can get inserted below this one, which requires we
…		…
1527	*/	1567	*/
1528		1568
1529	/* if this is not the head or flag has been passed, don't check walk on status */	1569	/* if this is not the head or flag has been passed, don't check walk on status */
1530	if (!(flag & INS_NO_WALK_ON) && op->is_head ())	1570	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1531	{	1571	{
1532	if (check_move_on (op, originator))	1572	if (check_move_on (op, originator, flag))
1533	return 0;	1573	return 0;
1534		1574
1535	/* If we are a multi part object, lets work our way through the check	1575	/* If we are a multi part object, let's work our way through the check
1536	* walk on's.	1576	* walk on's.
1537	*/	1577	*/
1538	for (object *tmp = op->more; tmp; tmp = tmp->more)	1578	for (object *tmp = op->more; tmp; tmp = tmp->more)
1539	if (check_move_on (tmp, originator))	1579	if (check_move_on (tmp, originator, flag))
1540	return 0;	1580	return 0;
1541	}	1581	}
1542		1582
1543	return op;	1583	return op;
1544	}	1584	}
…		…
1585	\|\| (items < m->max_items	1625	\|\| (items < m->max_items
1586	&& ms.volume () < m->max_volume))	1626	&& ms.volume () < m->max_volume))
1587	return true;	1627	return true;
1588		1628
1589	if (originator && originator->is_player ())	1629	if (originator && originator->is_player ())
1590	originator->contr->failmsg (format (	1630	originator->contr->failmsgf (
1591	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",	1631	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1592	query_name ()	1632	query_name ()
1593	));	1633	);
1594		1634
1595	return false;	1635	return false;
1596	}	1636	}
1597		1637
1598	/*	1638	/*
…		…
1610		1650
1611	nr = min (nr, nrof);	1651	nr = min (nr, nrof);
1612		1652
1613	if (nrof > nr)	1653	if (nrof > nr)
1614	{	1654	{
		1655	sint64 oweight = total_weight ();
		1656
1615	nrof -= nr;	1657	nrof -= nr;
1616	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1617		1658
1618	if (object *pl = visible_to ())	1659	if (object *pl = visible_to ())
1619	esrv_update_item (UPD_NROF, pl, this);	1660	esrv_update_item (UPD_NROF, pl, this);
		1661
		1662	adjust_weight (env, oweight, total_weight ());
1620		1663
1621	return true;	1664	return true;
1622	}	1665	}
1623	else	1666	else
1624	{	1667	{
…		…
1699	if (op->nrof)	1742	if (op->nrof)
1700	for (object *tmp = inv; tmp; tmp = tmp->below)	1743	for (object *tmp = inv; tmp; tmp = tmp->below)
1701	if (object::can_merge (tmp, op))	1744	if (object::can_merge (tmp, op))
1702	{	1745	{
1703	/* return the original object and remove inserted object	1746	/* return the original object and remove inserted object
1704	(client needs the original object) */	1747	(client prefers the original object) */
		1748
		1749	// carring must be 0 for mergable objects
		1750	sint64 oweight = tmp->weight * tmp->nrof;
		1751
1705	tmp->nrof += op->nrof;	1752	tmp->nrof += op->nrof;
1706		1753
1707	if (object *pl = tmp->visible_to ())	1754	if (object *pl = tmp->visible_to ())
1708	esrv_update_item (UPD_NROF, pl, tmp);	1755	esrv_update_item (UPD_NROF, pl, tmp);
1709		1756
1710	adjust_weight (this, op->total_weight ());	1757	adjust_weight (this, oweight, tmp->weight * tmp->nrof);
1711		1758
1712	op->destroy ();	1759	op->destroy ();
1713	op = tmp;	1760	op = tmp;
1714	goto inserted;	1761	goto inserted;
1715	}	1762	}
…		…
1731	op->flag [FLAG_REMOVED] = 0;	1778	op->flag [FLAG_REMOVED] = 0;
1732		1779
1733	if (object *pl = op->visible_to ())	1780	if (object *pl = op->visible_to ())
1734	esrv_send_item (pl, op);	1781	esrv_send_item (pl, op);
1735		1782
1736	adjust_weight (this, op->total_weight ());	1783	adjust_weight (this, 0, op->total_weight ());
1737		1784
1738	inserted:	1785	inserted:
1739	/* reset the light list and los of the players on the map */	1786	/* reset the light list and los of the players on the map */
1740	if (op->glow_radius && is_on_map ())	1787	if (op->glow_radius && is_on_map ())
1741	{	1788	{
…		…
1770	* MSW 2001-07-08: Check all objects on space, not just those below	1817	* MSW 2001-07-08: Check all objects on space, not just those below
1771	* object being inserted. insert_ob_in_map may not put new objects	1818	* object being inserted. insert_ob_in_map may not put new objects
1772	* on top.	1819	* on top.
1773	*/	1820	*/
1774	int	1821	int
1775	check_move_on (object op, object originator)	1822	check_move_on (object op, object originator, int flags)
1776	{	1823	{
1777	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1824	if (op->flag [FLAG_NO_APPLY])
1778	return 0;	1825	return 0;
1779		1826
1780	object *tmp;	1827	object *tmp;
1781	maptile *m = op->map;	1828	maptile *m = op->map;
1782	int x = op->x, y = op->y;	1829	int x = op->x, y = op->y;
…		…
1819	* Second check makes sure that the movement types not being slowed	1866	* Second check makes sure that the movement types not being slowed
1820	* (~slow_move) is not blocked on this space - just because the	1867	* (~slow_move) is not blocked on this space - just because the
1821	* space doesn't slow down swimming (for example), if you can't actually	1868	* space doesn't slow down swimming (for example), if you can't actually
1822	* swim on that space, can't use it to avoid the penalty.	1869	* swim on that space, can't use it to avoid the penalty.
1823	*/	1870	*/
1824	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1871	if (!op->flag [FLAG_WIZPASS])
1825	{	1872	{
1826	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1873	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1827	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1874	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1828	{	1875	{
1829	float diff = tmp->move_slow_penalty * fabs (op->speed);	1876	float diff = tmp->move_slow_penalty * fabs (op->speed);
…		…
1839		1886
1840	/* Basically same logic as above, except now for actual apply. */	1887	/* Basically same logic as above, except now for actual apply. */
1841	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|	1888	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|
1842	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1889	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1843	{	1890	{
		1891	if ((flags & INS_NO_AUTO_EXIT)
		1892	&& (tmp->type == EXIT \|\| tmp->type == TELEPORTER
		1893	\|\| tmp->type == HOLE \|\| tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead
		1894	continue;
		1895
1844	move_apply (tmp, op, originator);	1896	move_apply (tmp, op, originator);
1845		1897
1846	if (op->destroyed ())	1898	if (op->destroyed ())
1847	return 1;	1899	return 1;
1848		1900
…		…
1960	void	2012	void
1961	flag_inv (object *op, int flag)	2013	flag_inv (object *op, int flag)
1962	{	2014	{
1963	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2015	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1964	{	2016	{
1965	SET_FLAG (tmp, flag);	2017	tmp->set_flag (flag);
1966	flag_inv (tmp, flag);	2018	flag_inv (tmp, flag);
1967	}	2019	}
1968	}	2020	}
1969		2021
1970	/*	2022	/*
…		…
1973	void	2025	void
1974	unflag_inv (object *op, int flag)	2026	unflag_inv (object *op, int flag)
1975	{	2027	{
1976	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2028	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1977	{	2029	{
1978	CLEAR_FLAG (tmp, flag);	2030	tmp->clr_flag (flag);
1979	unflag_inv (tmp, flag);	2031	unflag_inv (tmp, flag);
1980	}	2032	}
1981	}	2033	}
1982		2034
1983	/*	2035	/*
…		…
2173	{	2225	{
2174	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2226	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2175	}	2227	}
2176		2228
2177	/*	2229	/*
2178	* find_dir_2(delta-x,delta-y) will return a direction in which	2230	* find_dir_2(delta-x,delta-y) will return a direction value
2179	* an object which has subtracted the x and y coordinates of another	2231	* for running into direct [dx, dy].
2180	* object, needs to travel toward it.	2232	* (the opposite of crossfire's find_dir_2!)
2181	*/	2233	*/
2182	int	2234	int
2183	find_dir_2 (int x, int y)	2235	find_dir_2 (int x, int y)
2184	{	2236	{
		2237	#if 1 // new algorithm
		2238	// this works by putting x, y into 16 sectors, which
		2239	// are not equal sized, but are a better approximation
		2240	// then the old algorithm, and then using a mapping
		2241	// table to map it into a direction value.
		2242	// basically, it maps these comparisons to each bit
		2243	// bit #3: x < 0
		2244	// bit #2: y < 0
		2245	// bit #1: x > y
		2246	// bit #0: x > 2y
		2247
		2248	static const uint8 dir[16] = {
		2249	4, 5, 4, 3,
		2250	2, 1, 2, 3,
		2251	6, 5, 6, 7,
		2252	8, 1, 8, 7,
		2253	};
		2254	int sector = 0;
		2255
		2256	// this is a bit ugly, but more likely to result in branchless code
		2257	sector \|= x < 0 ? 8 : 0;
		2258	x = x < 0 ? -x : x; // abs
		2259
		2260	sector \|= y < 0 ? 4 : 0;
		2261	y = y < 0 ? -y : y; // abs
		2262
		2263	if (x > y)
		2264	{
		2265	sector \|= 2;
		2266
		2267	if (x > y * 2)
		2268	sector \|= 1;
		2269	}
		2270	else
		2271	{
		2272	if (y > x * 2)
		2273	sector \|= 1;
		2274	else if (!y)
		2275	return 0; // x == 0 here
		2276	}
		2277
		2278	return dir [sector];
		2279	#else // old algorithm
2185	int q;	2280	int q;
2186		2281
2187	if (y)	2282	if (y)
2188	q = x * 100 / y;	2283	q = 128 * x / y;
2189	else if (x)	2284	else if (x)
2190	q = -300 * x;	2285	q = -512 * x; // to make it > 309
2191	else	2286	else
2192	return 0;	2287	return 0;
2193		2288
2194	if (y > 0)	2289	if (y > 0)
2195	{	2290	{
2196	if (q < -242)	2291	if (q < -309) return 7;
		2292	if (q < -52) return 6;
		2293	if (q < 52) return 5;
		2294	if (q < 309) return 4;
		2295
2197	return 3;	2296	return 3;
2198	if (q < -41)	2297	}
2199	return 2;	2298	else
2200	if (q < 41)	2299	{
2201	return 1;	2300	if (q < -309) return 3;
2202	if (q < 242)	2301	if (q < -52) return 2;
2203	return 8;	2302	if (q < 52) return 1;
		2303	if (q < 309) return 8;
		2304
2204	return 7;	2305	return 7;
2205	}	2306	}
2206		2307	#endif
2207	if (q < -242)
2208	return 7;
2209	if (q < -41)
2210	return 6;
2211	if (q < 41)
2212	return 5;
2213	if (q < 242)
2214	return 4;
2215
2216	return 3;
2217	}	2308	}
2218		2309
2219	/*	2310	/*
2220	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2311	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2221	* between two directions (which are expected to be absolute (see absdir())	2312	* between two directions (which are expected to be absolute (see absdir())
2222	*/	2313	*/
2223	int	2314	int
2224	dirdiff (int dir1, int dir2)	2315	dirdiff (int dir1, int dir2)
2225	{	2316	{
2226	int d;
2227
2228	d = abs (dir1 - dir2);	2317	int d = abs (dir1 - dir2);
2229	if (d > 4)
2230	d = 8 - d;
2231		2318
2232	return d;	2319	return d > 4 ? 8 - d : d;
2233	}	2320	}
2234		2321
2235	/* peterm:	2322	/* peterm:
2236	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2323	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2237	* Basically, this is a table of directions, and what directions	2324	* Basically, this is a table of directions, and what directions
…		…
2343	* Add a check so we can't pick up invisible objects (0.93.8)	2430	* Add a check so we can't pick up invisible objects (0.93.8)
2344	*/	2431	*/
2345	int	2432	int
2346	can_pick (const object who, const object item)	2433	can_pick (const object who, const object item)
2347	{	2434	{
2348	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2435	return /who->flag [FLAG_WIZ]\|\| /
2349	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2436	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2350	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));	2437	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2351	}	2438	}
2352		2439
2353	/*	2440	/*
2354	* create clone from object to another	2441	* create clone from object to another
2355	*/	2442	*/
…		…
2679		2766
2680	insert (force);	2767	insert (force);
2681	}	2768	}
2682	}	2769	}
2683		2770
		2771	void object::change_move_type (MoveType mt)
		2772	{
		2773	if (move_type == mt)
		2774	return;
		2775
		2776	if (is_on_map ())
		2777	{
		2778	// we are on the map, so handle move_on/off effects
		2779	remove ();
		2780	move_type = mt;
		2781	map->insert (this, x, y, this);
		2782	}
		2783	else
		2784	move_type = mt;
		2785	}
		2786
		2787	/* object should be a player.
		2788	* we return the object the player has marked with the 'mark' command
		2789	* below. If no match is found (or object has changed), we return
		2790	* NULL. We leave it up to the calling function to print messages if
		2791	* nothing is found.
		2792	*/
		2793	object *
		2794	object::mark () const
		2795	{
		2796	if (contr && contr->mark && contr->mark->env == this)
		2797	return contr->mark;
		2798	else
		2799	return 0;
		2800	}
		2801

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.309 by root, Sun Nov 29 17:41:07 2009 UTC vs. Revision 1.337 by root, Thu May 6 21:45:49 2010 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.309 by root, Sun Nov 29 17:41:07 2009 UTC vs.
Revision 1.337 by root, Thu May 6 21:45:49 2010 UTC