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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.76 by root, Thu Dec 21 01:33:49 2006 UTC vs.
Revision 1.91 by elmex, Tue Dec 26 10:51:52 2006 UTC

…		…
141	* objects with lists are rare, and lists stay short. If not, use a	141	* objects with lists are rare, and lists stay short. If not, use a
142	* different structure or at least keep the lists sorted...	142	* different structure or at least keep the lists sorted...
143	*/	143	*/
144		144
145	/* For each field in wants, */	145	/* For each field in wants, */
146	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	146	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147	{	147	{
148	key_value *has_field;	148	key_value *has_field;
149		149
150	/* Look for a field in has with the same key. */	150	/* Look for a field in has with the same key. */
151	has_field = get_ob_key_link (has, wants_field->key);	151	has_field = get_ob_key_link (has, wants_field->key);
…		…
221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222		222
223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225		225
226	if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	226	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
227	\|\| ob1->arch != ob2->arch	227	\|\| ob1->arch != ob2->arch
228	\|\| ob1->name != ob2->name	228	\|\| ob1->name != ob2->name
229	\|\| ob1->title != ob2->title	229	\|\| ob1->title != ob2->title
230	\|\| ob1->msg != ob2->msg	230	\|\| ob1->msg != ob2->msg
231	\|\| ob1->weight != ob2->weight	231	\|\| ob1->weight != ob2->weight
…		…
364	{	364	{
365	if (!op)	365	if (!op)
366	return strdup ("[NULLOBJ]");	366	return strdup ("[NULLOBJ]");
367		367
368	object_freezer freezer;	368	object_freezer freezer;
369	save_object (freezer, op, 3);	369	save_object (freezer, op, 1);
370	return freezer.as_string ();	370	return freezer.as_string ();
371	}	371	}
372		372
373	/*	373	/*
374	* get_nearest_part(multi-object, object 2) returns the part of the	374	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
467	}	467	}
468		468
469	op->key_values = 0;	469	op->key_values = 0;
470	}	470	}
471		471
472	void object::clear ()
473	{
474	attachable_base::clear ();
475
476	free_key_values (this);
477
478	owner = 0;
479	name = 0;
480	name_pl = 0;
481	title = 0;
482	race = 0;
483	slaying = 0;
484	skill = 0;
485	msg = 0;
486	lore = 0;
487	custom_name = 0;
488	materialname = 0;
489	contr = 0;
490	below = 0;
491	above = 0;
492	inv = 0;
493	container = 0;
494	env = 0;
495	more = 0;
496	head = 0;
497	map = 0;
498	active_next = 0;
499	active_prev = 0;
500
501	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
502
503	SET_FLAG (this, FLAG_REMOVED);
504
505	/* What is not cleared is next, prev, and count */
506
507	expmul = 1.0;
508	face = blank_face;
509
510	if (settings.casting_time)
511	casting_time = -1;
512	}
513
514	/*	472	/*
515	* copy_to first frees everything allocated by the dst object,	473	* copy_to first frees everything allocated by the dst object,
516	* and then copies the contents of itself into the second	474	* and then copies the contents of itself into the second
517	* object, allocating what needs to be allocated. Basically, any	475	* object, allocating what needs to be allocated. Basically, any
518	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	476	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
…		…
524	{	482	{
525	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
526	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
527		485
528	(object_copy )dst = *this;	486	(object_copy )dst = *this;
529	(object_pod )dst = *this;
530
531	if (self \|\| cb)
532	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
533		487
534	if (is_freed)	488	if (is_freed)
535	SET_FLAG (dst, FLAG_FREED);	489	SET_FLAG (dst, FLAG_FREED);
536		490
537	if (is_removed)	491	if (is_removed)
…		…
568	tail = new_link;	522	tail = new_link;
569	}	523	}
570	}	524	}
571	}	525	}
572		526
573	update_ob_speed (dst);	527	dst->set_speed (dst->speed);
574	}	528	}
575		529
576	object *	530	object *
577	object::clone ()	531	object::clone ()
578	{	532	{
…		…
600	* Updates the speed of an object. If the speed changes from 0 to another	554	* Updates the speed of an object. If the speed changes from 0 to another
601	* value, or vice versa, then add/remove the object from the active list.	555	* value, or vice versa, then add/remove the object from the active list.
602	* This function needs to be called whenever the speed of an object changes.	556	* This function needs to be called whenever the speed of an object changes.
603	*/	557	*/
604	void	558	void
605	update_ob_speed (object *op)	559	object::set_speed (float speed)
606	{	560	{
607	extern int arch_init;	561	extern int arch_init;
608		562
609	/* No reason putting the archetypes objects on the speed list,	563	/* No reason putting the archetypes objects on the speed list,
610	* since they never really need to be updated.	564	* since they never really need to be updated.
611	*/	565	*/
612		566	if (flag [FLAG_FREED] && speed)
613	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
614	{	567	{
615	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	568	LOG (llevError, "Object %s is freed but has speed.\n", &name);
616	#ifdef MANY_CORES
617	abort ();
618	#else
619	op->speed = 0;	569	speed = 0;
620	#endif
621	}	570	}
		571
		572	this->speed = speed;
622		573
623	if (arch_init)	574	if (arch_init)
624	return;	575	return;
625		576
626	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	577	if (FABS (speed) > MIN_ACTIVE_SPEED)
627	{	578	{
628	/* If already on active list, don't do anything */	579	/* If already on active list, don't do anything */
629	if (op->active_next \|\| op->active_prev \|\| op == active_objects)	580	if (active_next \|\| active_prev \|\| this == active_objects)
630	return;	581	return;
631		582
632	/* process_events() expects us to insert the object at the beginning	583	/* process_events() expects us to insert the object at the beginning
633	* of the list. */	584	* of the list. */
634	op->active_next = active_objects;	585	active_next = active_objects;
635		586
636	if (op->active_next != NULL)	587	if (active_next)
637	op->active_next->active_prev = op;	588	active_next->active_prev = this;
638		589
639	active_objects = op;	590	active_objects = this;
640	}	591	}
641	else	592	else
642	{	593	{
643	/* If not on the active list, nothing needs to be done */	594	/* If not on the active list, nothing needs to be done */
644	if (!op->active_next && !op->active_prev && op != active_objects)	595	if (!active_next && !active_prev && this != active_objects)
645	return;	596	return;
646		597
647	if (op->active_prev == NULL)	598	if (!active_prev)
648	{	599	{
649	active_objects = op->active_next;	600	active_objects = active_next;
650		601
651	if (op->active_next != NULL)	602	if (active_next)
652	op->active_next->active_prev = NULL;	603	active_next->active_prev = 0;
653	}	604	}
654	else	605	else
655	{	606	{
656	op->active_prev->active_next = op->active_next;	607	active_prev->active_next = active_next;
657		608
658	if (op->active_next)	609	if (active_next)
659	op->active_next->active_prev = op->active_prev;	610	active_next->active_prev = active_prev;
660	}	611	}
661		612
662	op->active_next = NULL;	613	active_next = 0;
663	op->active_prev = NULL;	614	active_prev = 0;
664	}	615	}
665	}	616	}
666		617
667	/* This function removes object 'op' from the list of active	618	/* This function removes object 'op' from the list of active
668	* objects.	619	* objects.
…		…
737	*/	688	*/
738	if (!op->map \|\| op->map->in_memory == MAP_SAVING)	689	if (!op->map \|\| op->map->in_memory == MAP_SAVING)
739	return;	690	return;
740		691
741	/* make sure the object is within map boundaries */	692	/* make sure the object is within map boundaries */
742	if (op->x < 0 \|\| op->x >= MAP_WIDTH (op->map) \|\| op->y < 0 \|\| op->y >= MAP_HEIGHT (op->map))	693	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)
743	{	694	{
744	LOG (llevError, "update_object() called for object out of map!\n");	695	LOG (llevError, "update_object() called for object out of map!\n");
745	#ifdef MANY_CORES	696	#ifdef MANY_CORES
746	abort ();	697	abort ();
747	#endif	698	#endif
…		…
784		735
785	if (op->more)	736	if (op->more)
786	update_object (op->more, action);	737	update_object (op->more, action);
787	}	738	}
788		739
789	object::vector object::mortals;
790	object::vector object::objects; // not yet used	740	object::vector object::objects; // not yet used
791	object *object::first;	741	object *object::first;
792
793	void object::free_mortals ()
794	{
795	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
796	if ((*i)->refcnt)
797	++i; // further delay freeing
798	else
799	{
800	delete *i;
801	mortals.erase (i);
802	}
803	}
804		742
805	object::object ()	743	object::object ()
806	{	744	{
807	SET_FLAG (this, FLAG_REMOVED);	745	SET_FLAG (this, FLAG_REMOVED);
808		746
…		…
840		778
841	prev = 0;	779	prev = 0;
842	next = 0;	780	next = 0;
843	}	781	}
844		782
		783	/*
		784	* Remove and free all objects in the inventory of the given object.
		785	* object.c ?
		786	*/
		787	void
		788	object::destroy_inv (bool drop_to_ground)
		789	{
		790	/* Only if the space blocks everything do we not process -
		791	* if some form of movement is allowed, let objects
		792	* drop on that space.
		793	*/
		794	if (!drop_to_ground \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
		795	{
		796	while (inv)
		797	inv->destroy ();
		798	}
		799	else
		800	{ /* Put objects in inventory onto this space */
		801	while (inv)
		802	{
		803	object *op = inv;
		804
		805	if (op->flag [FLAG_STARTEQUIP]
		806	\|\| op->flag [FLAG_NO_DROP]
		807	\|\| op->type == RUNE
		808	\|\| op->type == TRAP
		809	\|\| op->flag [FLAG_IS_A_TEMPLATE])
		810	op->destroy ();
		811	else
		812	{
		813	op->remove ();
		814	op->x = x;
		815	op->y = y;
		816	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
		817	}
		818	}
		819	}
		820	}
		821
845	object *object::create ()	822	object *object::create ()
846	{	823	{
847	object *op = new object;	824	object *op = new object;
848	op->link ();	825	op->link ();
849	return op;	826	return op;
850	}	827	}
851		828
852	/*	829	void
853	* free_object() frees everything allocated by an object, removes	830	object::do_destroy ()
854	* it from the list of used objects, and puts it on the list of
855	* free objects. The IS_FREED() flag is set in the object.
856	* The object must have been removed by remove_ob() first for
857	* this function to succeed.
858	*
859	* If destroy_inventory is set, free inventory as well. Else drop items in
860	* inventory to the ground.
861	*/
862	void object::destroy (bool destroy_inventory)
863	{	831	{
864	if (QUERY_FLAG (this, FLAG_FREED))	832	if (flag [FLAG_IS_LINKED])
		833	remove_button_link (this);
		834
		835	if (flag [FLAG_FRIENDLY])
		836	remove_friendly_object (this);
		837
		838	if (!flag [FLAG_REMOVED])
		839	remove ();
		840
		841	if (flag [FLAG_FREED])
865	return;	842	return;
866		843
867	if (QUERY_FLAG (this, FLAG_FRIENDLY))	844	flag [FLAG_FREED] = 1;
868	remove_friendly_object (this);
869		845
870	if (!QUERY_FLAG (this, FLAG_REMOVED))	846	attachable::do_destroy ();
871	remove ();
872		847
873	SET_FLAG (this, FLAG_FREED);	848	destroy_inv (true);
874		849	set_speed (0);
875	if (more)	850	unlink ();
876	{
877	more->destroy (destroy_inventory);
878	more = 0;
879	}
880
881	if (inv)
882	{
883	/* Only if the space blocks everything do we not process -
884	* if some form of movement is allowed, let objects
885	* drop on that space.
886	*/
887	if (destroy_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
888	{
889	object *op = inv;
890
891	while (op)
892	{
893	object *tmp = op->below;
894	op->destroy (destroy_inventory);
895	op = tmp;
896	}
897	}
898	else
899	{ /* Put objects in inventory onto this space */
900	object *op = inv;
901
902	while (op)
903	{
904	object *tmp = op->below;
905
906	op->remove ();
907
908	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
909	\|\| QUERY_FLAG (op, FLAG_NO_DROP) \|\| op->type == RUNE \|\| op->type == TRAP \|\| QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
910	op->destroy ();
911	else
912	{
913	op->x = x;
914	op->y = y;
915	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
916	}
917
918	op = tmp;
919	}
920	}
921	}
922		851
923	// hack to ensure that freed objects still have a valid map	852	// hack to ensure that freed objects still have a valid map
924	{	853	{
925	static maptile *freed_map; // freed objects are moved here to avoid crashes	854	static maptile *freed_map; // freed objects are moved here to avoid crashes
926		855
…		…
938	map = freed_map;	867	map = freed_map;
939	x = 1;	868	x = 1;
940	y = 1;	869	y = 1;
941	}	870	}
942		871
		872	head = 0;
		873
		874	if (more)
		875	{
		876	more->destroy ();
		877	more = 0;
		878	}
		879
943	// clear those pointers that likely might have circular references to us	880	// clear those pointers that likely might have circular references to us
944	owner = 0;	881	owner = 0;
945	enemy = 0;	882	enemy = 0;
946	attacked_by = 0;	883	attacked_by = 0;
947		884
948	// only relevant for players(?), but make sure of it anyways	885	// only relevant for players(?), but make sure of it anyways
949	contr = 0;	886	contr = 0;
		887	}
950		888
951	/* Remove object from the active list */	889	void
952	speed = 0;	890	object::destroy (bool destroy_inventory)
953	update_ob_speed (this);	891	{
		892	if (destroyed ())
		893	return;
954		894
955	unlink ();	895	if (destroy_inventory)
		896	destroy_inv (false);
956		897
957	mortals.push_back (this);	898	attachable::destroy ();
958	}	899	}
959		900
960	/*	901	/*
961	* sub_weight() recursively (outwards) subtracts a number from the	902	* sub_weight() recursively (outwards) subtracts a number from the
962	* weight of an object (and what is carried by it's environment(s)).	903	* weight of an object (and what is carried by it's environment(s)).
…		…
986	object::remove ()	927	object::remove ()
987	{	928	{
988	object tmp, last = 0;	929	object tmp, last = 0;
989	object *otmp;	930	object *otmp;
990		931
991	int check_walk_off;
992
993	if (QUERY_FLAG (this, FLAG_REMOVED))	932	if (QUERY_FLAG (this, FLAG_REMOVED))
994	return;	933	return;
995		934
996	SET_FLAG (this, FLAG_REMOVED);	935	SET_FLAG (this, FLAG_REMOVED);
		936	INVOKE_OBJECT (REMOVE, this);
997		937
998	if (more)	938	if (more)
999	more->remove ();	939	more->remove ();
1000		940
1001	/*	941	/*
…		…
1012	/* NO_FIX_PLAYER is set when a great many changes are being	952	/* NO_FIX_PLAYER is set when a great many changes are being
1013	* made to players inventory. If set, avoiding the call	953	* made to players inventory. If set, avoiding the call
1014	* to save cpu time.	954	* to save cpu time.
1015	*/	955	*/
1016	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	956	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1017	fix_player (otmp);	957	otmp->update_stats ();
1018		958
1019	if (above != NULL)	959	if (above != NULL)
1020	above->below = below;	960	above->below = below;
1021	else	961	else
1022	env->inv = below;	962	env->inv = below;
…		…
1063	dump = dump_object (GET_MAP_OB (map, x, y));	1003	dump = dump_object (GET_MAP_OB (map, x, y));
1064	LOG (llevError, "%s\n", dump);	1004	LOG (llevError, "%s\n", dump);
1065	free (dump);	1005	free (dump);
1066	}	1006	}
1067		1007
1068	map->at (x, y).bottom = above; /* goes on above it. */	1008	map->at (x, y).bot = above; /* goes on above it. */
1069	}	1009	}
1070		1010
1071	above = 0;	1011	above = 0;
1072	below = 0;	1012	below = 0;
1073		1013
1074	if (map->in_memory == MAP_SAVING)	1014	if (map->in_memory == MAP_SAVING)
1075	return;	1015	return;
1076		1016
1077	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	1017	int check_walk_off = !flag [FLAG_NO_APPLY];
1078		1018
1079	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1019	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1080	{	1020	{
1081	/* No point updating the players look faces if he is the object	1021	/* No point updating the players look faces if he is the object
1082	* being removed.	1022	* being removed.
1083	*/	1023	*/
1084		1024
…		…
1088	* removed (most likely destroyed), update the player view	1028	* removed (most likely destroyed), update the player view
1089	* appropriately.	1029	* appropriately.
1090	*/	1030	*/
1091	if (tmp->container == this)	1031	if (tmp->container == this)
1092	{	1032	{
1093	CLEAR_FLAG (this, FLAG_APPLIED);	1033	flag [FLAG_APPLIED] = 0;
1094	tmp->container = 0;	1034	tmp->container = 0;
1095	}	1035	}
1096		1036
		1037	if (tmp->contr->ns)
1097	tmp->contr->socket->floorbox_update ();	1038	tmp->contr->ns->floorbox_update ();
1098	}	1039	}
1099		1040
1100	/* See if player moving off should effect something */	1041	/* See if player moving off should effect something */
1101	if (check_walk_off	1042	if (check_walk_off
1102	&& ((move_type & tmp->move_off)	1043	&& ((move_type & tmp->move_off)
…		…
1120	if (!last)	1061	if (!last)
1121	map->at (x, y).flags_ = P_NEED_UPDATE;	1062	map->at (x, y).flags_ = P_NEED_UPDATE;
1122	else	1063	else
1123	update_object (last, UP_OBJ_REMOVE);	1064	update_object (last, UP_OBJ_REMOVE);
1124		1065
1125	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) \|\| glow_radius)	1066	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1126	update_all_los (map, x, y);	1067	update_all_los (map, x, y);
1127	}	1068	}
1128	}	1069	}
1129		1070
1130	/*	1071	/*
…		…
1139	merge_ob (object op, object top)	1080	merge_ob (object op, object top)
1140	{	1081	{
1141	if (!op->nrof)	1082	if (!op->nrof)
1142	return 0;	1083	return 0;
1143		1084
1144	if (top == NULL)	1085	if (top)
1145	for (top = op; top != NULL && top->above != NULL; top = top->above);	1086	for (top = op; top && top->above; top = top->above)
		1087	;
1146		1088
1147	for (; top != NULL; top = top->below)	1089	for (; top; top = top->below)
1148	{	1090	{
1149	if (top == op)	1091	if (top == op)
1150	continue;	1092	continue;
1151		1093
1152	if (object::can_merge (op, top))	1094	if (object::can_merge (op, top))
…		…
1202	* Return value:	1144	* Return value:
1203	* new object if 'op' was merged with other object	1145	* new object if 'op' was merged with other object
1204	* NULL if 'op' was destroyed	1146	* NULL if 'op' was destroyed
1205	* just 'op' otherwise	1147	* just 'op' otherwise
1206	*/	1148	*/
1207
1208	object *	1149	object *
1209	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1150	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1210	{	1151	{
1211	object tmp, top, *floor = NULL;	1152	object tmp, top, *floor = NULL;
1212	sint16 x, y;	1153	sint16 x, y;
…		…
1246	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);	1187	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1247	free (dump);	1188	free (dump);
1248	return op;	1189	return op;
1249	}	1190	}
1250		1191
1251	if (op->more != NULL)	1192	if (op->more)
1252	{	1193	{
1253	/* The part may be on a different map. */	1194	/* The part may be on a different map. */
1254		1195
1255	object *more = op->more;	1196	object *more = op->more;
1256		1197
…		…
1272	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1213	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1273	{	1214	{
1274	if (!op->head)	1215	if (!op->head)
1275	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1216	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1276		1217
1277	return NULL;	1218	return 0;
1278	}	1219	}
1279	}	1220	}
1280		1221
1281	CLEAR_FLAG (op, FLAG_REMOVED);	1222	CLEAR_FLAG (op, FLAG_REMOVED);
1282		1223
…		…
1316	op->below = originator->below;	1257	op->below = originator->below;
1317		1258
1318	if (op->below)	1259	if (op->below)
1319	op->below->above = op;	1260	op->below->above = op;
1320	else	1261	else
1321	op->ms ().bottom = op;	1262	op->ms ().bot = op;
1322		1263
1323	/* since below originator, no need to update top */	1264	/* since below originator, no need to update top */
1324	originator->below = op;	1265	originator->below = op;
1325	}	1266	}
1326	else	1267	else
…		…
1405		1346
1406	if (op->above)	1347	if (op->above)
1407	op->above->below = op;	1348	op->above->below = op;
1408		1349
1409	op->below = NULL;	1350	op->below = NULL;
1410	op->ms ().bottom = op;	1351	op->ms ().bot = op;
1411	}	1352	}
1412	else	1353	else
1413	{ /* get inserted into the stack above top */	1354	{ /* get inserted into the stack above top */
1414	op->above = top->above;	1355	op->above = top->above;
1415		1356
…		…
1430	/* If we have a floor, we know the player, if any, will be above	1371	/* If we have a floor, we know the player, if any, will be above
1431	* it, so save a few ticks and start from there.	1372	* it, so save a few ticks and start from there.
1432	*/	1373	*/
1433	if (!(flag & INS_MAP_LOAD))	1374	if (!(flag & INS_MAP_LOAD))
1434	if (object *pl = op->ms ().player ())	1375	if (object *pl = op->ms ().player ())
		1376	if (pl->contr->ns)
1435	pl->contr->socket->floorbox_update ();	1377	pl->contr->ns->floorbox_update ();
1436		1378
1437	/* If this object glows, it may affect lighting conditions that are	1379	/* If this object glows, it may affect lighting conditions that are
1438	* visible to others on this map. But update_all_los is really	1380	* visible to others on this map. But update_all_los is really
1439	* an inefficient way to do this, as it means los for all players	1381	* an inefficient way to do this, as it means los for all players
1440	* on the map will get recalculated. The players could very well	1382	* on the map will get recalculated. The players could very well
1441	* be far away from this change and not affected in any way -	1383	* be far away from this change and not affected in any way -
1442	* this should get redone to only look for players within range,	1384	* this should get redone to only look for players within range,
1443	* or just updating the P_NEED_UPDATE for spaces within this area	1385	* or just updating the P_NEED_UPDATE for spaces within this area
1444	* of effect may be sufficient.	1386	* of effect may be sufficient.
1445	*/	1387	*/
1446	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1388	if (op->map->darkness && (op->glow_radius != 0))
1447	update_all_los (op->map, op->x, op->y);	1389	update_all_los (op->map, op->x, op->y);
1448		1390
1449	/* updates flags (blocked, alive, no magic, etc) for this map space */	1391	/* updates flags (blocked, alive, no magic, etc) for this map space */
1450	update_object (op, UP_OBJ_INSERT);	1392	update_object (op, UP_OBJ_INSERT);
		1393
		1394	INVOKE_OBJECT (INSERT, op);
1451		1395
1452	/* Don't know if moving this to the end will break anything. However,	1396	/* Don't know if moving this to the end will break anything. However,
1453	* we want to have floorbox_update called before calling this.	1397	* we want to have floorbox_update called before calling this.
1454	*	1398	*
1455	* check_move_on() must be after this because code called from	1399	* check_move_on() must be after this because code called from
…		…
1460		1404
1461	/* if this is not the head or flag has been passed, don't check walk on status */	1405	/* if this is not the head or flag has been passed, don't check walk on status */
1462	if (!(flag & INS_NO_WALK_ON) && !op->head)	1406	if (!(flag & INS_NO_WALK_ON) && !op->head)
1463	{	1407	{
1464	if (check_move_on (op, originator))	1408	if (check_move_on (op, originator))
1465	return NULL;	1409	return 0;
1466		1410
1467	/* If we are a multi part object, lets work our way through the check	1411	/* If we are a multi part object, lets work our way through the check
1468	* walk on's.	1412	* walk on's.
1469	*/	1413	*/
1470	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1414	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1471	if (check_move_on (tmp, originator))	1415	if (check_move_on (tmp, originator))
1472	return NULL;	1416	return 0;
1473	}	1417	}
1474		1418
1475	return op;	1419	return op;
1476	}	1420	}
1477		1421
…		…
1548		1492
1549	object *	1493	object *
1550	decrease_ob_nr (object *op, uint32 i)	1494	decrease_ob_nr (object *op, uint32 i)
1551	{	1495	{
1552	object *tmp;	1496	object *tmp;
1553	player *pl;
1554		1497
1555	if (i == 0) /* objects with op->nrof require this check */	1498	if (i == 0) /* objects with op->nrof require this check */
1556	return op;	1499	return op;
1557		1500
1558	if (i > op->nrof)	1501	if (i > op->nrof)
…		…
1571	* IMO, searching through all the players will mostly	1514	* IMO, searching through all the players will mostly
1572	* likely be quicker than following op->env to the map,	1515	* likely be quicker than following op->env to the map,
1573	* and then searching the map for a player.	1516	* and then searching the map for a player.
1574	*/	1517	*/
1575	if (!tmp)	1518	if (!tmp)
1576	{	1519	for_all_players (pl)
1577	for (pl = first_player; pl; pl = pl->next)
1578	if (pl->ob->container == op->env)	1520	if (pl->ob->container == op->env)
1579	{	1521	{
1580	tmp = pl->ob;	1522	tmp = pl->ob;
1581	break;	1523	break;
1582	}	1524	}
1583	}
1584		1525
1585	if (i < op->nrof)	1526	if (i < op->nrof)
1586	{	1527	{
1587	sub_weight (op->env, op->weight * i);	1528	sub_weight (op->env, op->weight * i);
1588	op->nrof -= i;	1529	op->nrof -= i;
…		…
1724	add_weight (this, (op->weight + op->carrying));	1665	add_weight (this, (op->weight + op->carrying));
1725		1666
1726	otmp = this->in_player ();	1667	otmp = this->in_player ();
1727	if (otmp && otmp->contr)	1668	if (otmp && otmp->contr)
1728	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1669	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1729	fix_player (otmp);	1670	otmp->update_stats ();
1730		1671
1731	op->map = 0;	1672	op->map = 0;
1732	op->env = this;	1673	op->env = this;
1733	op->above = 0;	1674	op->above = 0;
1734	op->below = 0;	1675	op->below = 0;
…		…
1738	if ((op->glow_radius != 0) && map)	1679	if ((op->glow_radius != 0) && map)
1739	{	1680	{
1740	#ifdef DEBUG_LIGHTS	1681	#ifdef DEBUG_LIGHTS
1741	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1682	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1742	#endif /* DEBUG_LIGHTS */	1683	#endif /* DEBUG_LIGHTS */
1743	if (MAP_DARKNESS (map))	1684	if (map->darkness)
1744	update_all_los (map, x, y);	1685	update_all_los (map, x, y);
1745	}	1686	}
1746		1687
1747	/* Client has no idea of ordering so lets not bother ordering it here.	1688	/* Client has no idea of ordering so lets not bother ordering it here.
1748	* It sure simplifies this function...	1689	* It sure simplifies this function...
…		…
1753	{	1694	{
1754	op->below = inv;	1695	op->below = inv;
1755	op->below->above = op;	1696	op->below->above = op;
1756	inv = op;	1697	inv = op;
1757	}	1698	}
		1699
		1700	INVOKE_OBJECT (INSERT, this);
1758		1701
1759	return op;	1702	return op;
1760	}	1703	}
1761		1704
1762	/*	1705	/*
…		…
1814		1757
1815	/* The objects have to be checked from top to bottom.	1758	/* The objects have to be checked from top to bottom.
1816	* Hence, we first go to the top:	1759	* Hence, we first go to the top:
1817	*/	1760	*/
1818		1761
1819	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1762	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)
1820	{	1763	{
1821	/* Trim the search when we find the first other spell effect	1764	/* Trim the search when we find the first other spell effect
1822	* this helps performance so that if a space has 50 spell objects,	1765	* this helps performance so that if a space has 50 spell objects,
1823	* we don't need to check all of them.	1766	* we don't need to check all of them.
1824	*/	1767	*/
…		…
1879	/*	1822	/*
1880	* present_arch(arch, map, x, y) searches for any objects with	1823	* present_arch(arch, map, x, y) searches for any objects with
1881	* a matching archetype at the given map and coordinates.	1824	* a matching archetype at the given map and coordinates.
1882	* The first matching object is returned, or NULL if none.	1825	* The first matching object is returned, or NULL if none.
1883	*/	1826	*/
1884
1885	object *	1827	object *
1886	present_arch (const archetype at, maptile m, int x, int y)	1828	present_arch (const archetype at, maptile m, int x, int y)
1887	{	1829	{
1888	object *
1889	tmp;
1890
1891	if (m == NULL \|\| out_of_map (m, x, y))	1830	if (m == NULL \|\| out_of_map (m, x, y))
1892	{	1831	{
1893	LOG (llevError, "Present_arch called outside map.\n");	1832	LOG (llevError, "Present_arch called outside map.\n");
1894	return NULL;	1833	return NULL;
1895	}	1834	}
		1835
1896	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1836	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1897	if (tmp->arch == at)	1837	if (tmp->arch == at)
1898	return tmp;	1838	return tmp;
		1839
1899	return NULL;	1840	return NULL;
1900	}	1841	}
1901		1842
1902	/*	1843	/*
1903	* present(type, map, x, y) searches for any objects with	1844	* present(type, map, x, y) searches for any objects with
1904	* a matching type variable at the given map and coordinates.	1845	* a matching type variable at the given map and coordinates.
1905	* The first matching object is returned, or NULL if none.	1846	* The first matching object is returned, or NULL if none.
1906	*/	1847	*/
1907
1908	object *	1848	object *
1909	present (unsigned char type, maptile *m, int x, int y)	1849	present (unsigned char type, maptile *m, int x, int y)
1910	{	1850	{
1911	object *
1912	tmp;
1913
1914	if (out_of_map (m, x, y))	1851	if (out_of_map (m, x, y))
1915	{	1852	{
1916	LOG (llevError, "Present called outside map.\n");	1853	LOG (llevError, "Present called outside map.\n");
1917	return NULL;	1854	return NULL;
1918	}	1855	}
		1856
1919	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1857	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1920	if (tmp->type == type)	1858	if (tmp->type == type)
1921	return tmp;	1859	return tmp;
		1860
1922	return NULL;	1861	return NULL;
1923	}	1862	}
1924		1863
1925	/*	1864	/*
1926	* present_in_ob(type, object) searches for any objects with	1865	* present_in_ob(type, object) searches for any objects with
1927	* a matching type variable in the inventory of the given object.	1866	* a matching type variable in the inventory of the given object.
1928	* The first matching object is returned, or NULL if none.	1867	* The first matching object is returned, or NULL if none.
1929	*/	1868	*/
1930
1931	object *	1869	object *
1932	present_in_ob (unsigned char type, const object *op)	1870	present_in_ob (unsigned char type, const object *op)
1933	{	1871	{
1934	object *
1935	tmp;
1936
1937	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1872	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1938	if (tmp->type == type)	1873	if (tmp->type == type)
1939	return tmp;	1874	return tmp;
		1875
1940	return NULL;	1876	return NULL;
1941	}	1877	}
1942		1878
1943	/*	1879	/*
1944	* present_in_ob (type, str, object) searches for any objects with	1880	* present_in_ob (type, str, object) searches for any objects with
…		…
1952	* str is the string to match against. Note that we match against	1888	* str is the string to match against. Note that we match against
1953	* the object name, not the archetype name. this is so that the	1889	* the object name, not the archetype name. this is so that the
1954	* spell code can use one object type (force), but change it's name	1890	* spell code can use one object type (force), but change it's name
1955	* to be unique.	1891	* to be unique.
1956	*/	1892	*/
1957
1958	object *	1893	object *
1959	present_in_ob_by_name (int type, const char str, const object op)	1894	present_in_ob_by_name (int type, const char str, const object op)
1960	{	1895	{
1961	object *
1962	tmp;
1963
1964	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1896	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1965	{
1966	if ((type == -1 \|\| tmp->type == type) && (!strcmp (str, tmp->name)))	1897	if ((type == -1 \|\| tmp->type == type) && (!strcmp (str, tmp->name)))
1967	return tmp;	1898	return tmp;
1968	}	1899
1969	return NULL;	1900	return 0;
1970	}	1901	}
1971		1902
1972	/*	1903	/*
1973	* present_arch_in_ob(archetype, object) searches for any objects with	1904	* present_arch_in_ob(archetype, object) searches for any objects with
1974	* a matching archetype in the inventory of the given object.	1905	* a matching archetype in the inventory of the given object.
1975	* The first matching object is returned, or NULL if none.	1906	* The first matching object is returned, or NULL if none.
1976	*/	1907	*/
1977
1978	object *	1908	object *
1979	present_arch_in_ob (const archetype at, const object op)	1909	present_arch_in_ob (const archetype at, const object op)
1980	{	1910	{
1981	object *
1982	tmp;
1983
1984	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1911	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1985	if (tmp->arch == at)	1912	if (tmp->arch == at)
1986	return tmp;	1913	return tmp;
		1914
1987	return NULL;	1915	return NULL;
1988	}	1916	}
1989		1917
1990	/*	1918	/*
1991	* activate recursively a flag on an object inventory	1919	* activate recursively a flag on an object inventory
1992	*/	1920	*/
1993	void	1921	void
1994	flag_inv (object *op, int flag)	1922	flag_inv (object *op, int flag)
1995	{	1923	{
1996	object *
1997	tmp;
1998
1999	if (op->inv)	1924	if (op->inv)
2000	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1925	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2001	{	1926	{
2002	SET_FLAG (tmp, flag);	1927	SET_FLAG (tmp, flag);
2003	flag_inv (tmp, flag);	1928	flag_inv (tmp, flag);
2004	}	1929	}
2005	} /*	1930	}
		1931
		1932	/*
2006	* desactivate recursively a flag on an object inventory	1933	* deactivate recursively a flag on an object inventory
2007	*/	1934	*/
2008	void	1935	void
2009	unflag_inv (object *op, int flag)	1936	unflag_inv (object *op, int flag)
2010	{	1937	{
2011	object *
2012	tmp;
2013
2014	if (op->inv)	1938	if (op->inv)
2015	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1939	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2016	{	1940	{
2017	CLEAR_FLAG (tmp, flag);	1941	CLEAR_FLAG (tmp, flag);
2018	unflag_inv (tmp, flag);	1942	unflag_inv (tmp, flag);
2019	}	1943	}
2020	}	1944	}
…		…
2023	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1947	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2024	* all it's inventory (recursively).	1948	* all it's inventory (recursively).
2025	* If checksums are used, a player will get set_cheat called for	1949	* If checksums are used, a player will get set_cheat called for
2026	* him/her-self and all object carried by a call to this function.	1950	* him/her-self and all object carried by a call to this function.
2027	*/	1951	*/
2028
2029	void	1952	void
2030	set_cheat (object *op)	1953	set_cheat (object *op)
2031	{	1954	{
2032	SET_FLAG (op, FLAG_WAS_WIZ);	1955	SET_FLAG (op, FLAG_WAS_WIZ);
2033	flag_inv (op, FLAG_WAS_WIZ);	1956	flag_inv (op, FLAG_WAS_WIZ);
…		…
2052	* because arch_blocked (now ob_blocked) needs to know the movement type	1975	* because arch_blocked (now ob_blocked) needs to know the movement type
2053	* to know if the space in question will block the object. We can't use	1976	* to know if the space in question will block the object. We can't use
2054	* the archetype because that isn't correct if the monster has been	1977	* the archetype because that isn't correct if the monster has been
2055	* customized, changed states, etc.	1978	* customized, changed states, etc.
2056	*/	1979	*/
2057
2058	int	1980	int
2059	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)	1981	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)
2060	{	1982	{
2061	int
2062	i,
2063	index = 0, flag;	1983	int index = 0, flag;
2064	static int
2065	altern[SIZEOFFREE];	1984	int altern[SIZEOFFREE];
2066		1985
2067	for (i = start; i < stop; i++)	1986	for (int i = start; i < stop; i++)
2068	{	1987	{
2069	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1988	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2070	if (!flag)	1989	if (!flag)
2071	altern[index++] = i;	1990	altern [index++] = i;
2072		1991
2073	/* Basically, if we find a wall on a space, we cut down the search size.	1992	/* Basically, if we find a wall on a space, we cut down the search size.
2074	* In this way, we won't return spaces that are on another side of a wall.	1993	* In this way, we won't return spaces that are on another side of a wall.
2075	* This mostly work, but it cuts down the search size in all directions -	1994	* This mostly work, but it cuts down the search size in all directions -
2076	* if the space being examined only has a wall to the north and empty	1995	* if the space being examined only has a wall to the north and empty
…		…
2092	* find_first_free_spot(archetype, maptile, x, y) works like	2011	* find_first_free_spot(archetype, maptile, x, y) works like
2093	* find_free_spot(), but it will search max number of squares.	2012	* find_free_spot(), but it will search max number of squares.
2094	* But it will return the first available spot, not a random choice.	2013	* But it will return the first available spot, not a random choice.
2095	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2014	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2096	*/	2015	*/
2097
2098	int	2016	int
2099	find_first_free_spot (const object ob, maptile m, int x, int y)	2017	find_first_free_spot (const object ob, maptile m, int x, int y)
2100	{	2018	{
2101	int
2102	i;
2103
2104	for (i = 0; i < SIZEOFFREE; i++)	2019	for (int i = 0; i < SIZEOFFREE; i++)
2105	{
2106	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2020	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2107	return i;	2021	return i;
2108	}	2022
2109	return -1;	2023	return -1;
2110	}	2024	}
2111		2025
2112	/*	2026	/*
2113	* The function permute(arr, begin, end) randomly reorders the array	2027	* The function permute(arr, begin, end) randomly reorders the array
2114	* arr[begin..end-1].	2028	* arr[begin..end-1].
		2029	* now uses a fisher-yates shuffle, old permute was broken
2115	*/	2030	*/
2116	static void	2031	static void
2117	permute (int *arr, int begin, int end)	2032	permute (int *arr, int begin, int end)
2118	{	2033	{
2119	int	2034	arr += begin;
2120	i,
2121	j,
2122	tmp,
2123	len;
2124
2125	len = end - begin;	2035	end -= begin;
2126	for (i = begin; i < end; i++)
2127	{
2128	j = begin + RANDOM () % len;
2129		2036
2130	tmp = arr[i];	2037	while (--end)
2131	arr[i] = arr[j];	2038	swap (arr [end], arr [RANDOM () % (end + 1)]);
2132	arr[j] = tmp;
2133	}
2134	}	2039	}
2135		2040
2136	/* new function to make monster searching more efficient, and effective!	2041	/* new function to make monster searching more efficient, and effective!
2137	* This basically returns a randomized array (in the passed pointer) of	2042	* This basically returns a randomized array (in the passed pointer) of
2138	* the spaces to find monsters. In this way, it won't always look for	2043	* the spaces to find monsters. In this way, it won't always look for
…		…
2141	* the 3x3 area will be searched, just not in a predictable order.	2046	* the 3x3 area will be searched, just not in a predictable order.
2142	*/	2047	*/
2143	void	2048	void
2144	get_search_arr (int *search_arr)	2049	get_search_arr (int *search_arr)
2145	{	2050	{
2146	int	2051	int i;
2147	i;
2148		2052
2149	for (i = 0; i < SIZEOFFREE; i++)	2053	for (i = 0; i < SIZEOFFREE; i++)
2150	{
2151	search_arr[i] = i;	2054	search_arr[i] = i;
2152	}
2153		2055
2154	permute (search_arr, 1, SIZEOFFREE1 + 1);	2056	permute (search_arr, 1, SIZEOFFREE1 + 1);
2155	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2057	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2156	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2058	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2157	}	2059	}
…		…
2166	* Perhaps incorrectly, but I'm making the assumption that exclude	2068	* Perhaps incorrectly, but I'm making the assumption that exclude
2167	* is actually want is going to try and move there. We need this info	2069	* is actually want is going to try and move there. We need this info
2168	* because we have to know what movement the thing looking to move	2070	* because we have to know what movement the thing looking to move
2169	* there is capable of.	2071	* there is capable of.
2170	*/	2072	*/
2171
2172	int	2073	int
2173	find_dir (maptile m, int x, int y, object exclude)	2074	find_dir (maptile m, int x, int y, object exclude)
2174	{	2075	{
2175	int
2176	i,
2177	max = SIZEOFFREE, mflags;	2076	int i, max = SIZEOFFREE, mflags;
2178		2077
2179	sint16 nx, ny;	2078	sint16 nx, ny;
2180	object *	2079	object *tmp;
2181	tmp;
2182	maptile *	2080	maptile *mp;
2183	mp;
2184		2081
2185	MoveType blocked, move_type;	2082	MoveType blocked, move_type;
2186		2083
2187	if (exclude && exclude->head)	2084	if (exclude && exclude->head)
2188	{	2085	{
…		…
2205		2102
2206	if (mflags & P_OUT_OF_MAP)	2103	if (mflags & P_OUT_OF_MAP)
2207	max = maxfree[i];	2104	max = maxfree[i];
2208	else	2105	else
2209	{	2106	{
2210	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2107	mapspace &ms = mp->at (nx, ny);
		2108
		2109	blocked = ms.move_block;
2211		2110
2212	if ((move_type & blocked) == move_type)	2111	if ((move_type & blocked) == move_type)
2213	max = maxfree[i];	2112	max = maxfree[i];
2214	else if (mflags & P_IS_ALIVE)	2113	else if (mflags & P_IS_ALIVE)
2215	{	2114	{
2216	for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)	2115	for (tmp = ms.bot; tmp; tmp = tmp->above)
2217	if ((QUERY_FLAG (tmp, FLAG_MONSTER) \|\| tmp->type == PLAYER) && (tmp != exclude \|\| (tmp->head && tmp->head != exclude)))	2116	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)
		2117	&& (tmp != exclude \|\| (tmp->head && tmp->head != exclude)))
2218	break;	2118	break;
2219		2119
2220	if (tmp)	2120	if (tmp)
2221	return freedir[i];	2121	return freedir[i];
2222	}	2122	}
…		…
2228		2128
2229	/*	2129	/*
2230	* distance(object 1, object 2) will return the square of the	2130	* distance(object 1, object 2) will return the square of the
2231	* distance between the two given objects.	2131	* distance between the two given objects.
2232	*/	2132	*/
2233
2234	int	2133	int
2235	distance (const object ob1, const object ob2)	2134	distance (const object ob1, const object ob2)
2236	{	2135	{
2237	int i;
2238
2239	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2136	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2240	return i;
2241	}	2137	}
2242		2138
2243	/*	2139	/*
2244	* find_dir_2(delta-x,delta-y) will return a direction in which	2140	* find_dir_2(delta-x,delta-y) will return a direction in which
2245	* an object which has subtracted the x and y coordinates of another	2141	* an object which has subtracted the x and y coordinates of another
2246	* object, needs to travel toward it.	2142	* object, needs to travel toward it.
2247	*/	2143	*/
2248
2249	int	2144	int
2250	find_dir_2 (int x, int y)	2145	find_dir_2 (int x, int y)
2251	{	2146	{
2252	int q;	2147	int q;
2253		2148
…		…
2292	int	2187	int
2293	absdir (int d)	2188	absdir (int d)
2294	{	2189	{
2295	while (d < 1)	2190	while (d < 1)
2296	d += 8;	2191	d += 8;
		2192
2297	while (d > 8)	2193	while (d > 8)
2298	d -= 8;	2194	d -= 8;
		2195
2299	return d;	2196	return d;
2300	}	2197	}
2301		2198
2302	/*	2199	/*
2303	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2200	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
…		…
2305	*/	2202	*/
2306		2203
2307	int	2204	int
2308	dirdiff (int dir1, int dir2)	2205	dirdiff (int dir1, int dir2)
2309	{	2206	{
2310	int	2207	int d;
2311	d;
2312		2208
2313	d = abs (dir1 - dir2);	2209	d = abs (dir1 - dir2);
2314	if (d > 4)	2210	if (d > 4)
2315	d = 8 - d;	2211	d = 8 - d;
		2212
2316	return d;	2213	return d;
2317	}	2214	}
2318		2215
2319	/* peterm:	2216	/* peterm:
2320	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2217	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2323	* This basically means that if direction is 15, then it could either go	2220	* This basically means that if direction is 15, then it could either go
2324	* direction 4, 14, or 16 to get back to where we are.	2221	* direction 4, 14, or 16 to get back to where we are.
2325	* Moved from spell_util.c to object.c with the other related direction	2222	* Moved from spell_util.c to object.c with the other related direction
2326	* functions.	2223	* functions.
2327	*/	2224	*/
2328
2329	int
2330	reduction_dir[SIZEOFFREE][3] = {	2225	int reduction_dir[SIZEOFFREE][3] = {
2331	{0, 0, 0}, /* 0 */	2226	{0, 0, 0}, /* 0 */
2332	{0, 0, 0}, /* 1 */	2227	{0, 0, 0}, /* 1 */
2333	{0, 0, 0}, /* 2 */	2228	{0, 0, 0}, /* 2 */
2334	{0, 0, 0}, /* 3 */	2229	{0, 0, 0}, /* 3 */
2335	{0, 0, 0}, /* 4 */	2230	{0, 0, 0}, /* 4 */
…		…
2485	/* Basically, we save the content of the string to a temp file, then call */	2380	/* Basically, we save the content of the string to a temp file, then call */
2486	/* load_object on it. I admit it is a highly inefficient way to make things, */	2381	/* load_object on it. I admit it is a highly inefficient way to make things, */
2487	/* but it was simple to make and allows reusing the load_object function. */	2382	/* but it was simple to make and allows reusing the load_object function. */
2488	/* Remember not to use load_object_str in a time-critical situation. */	2383	/* Remember not to use load_object_str in a time-critical situation. */
2489	/* Also remember that multiparts objects are not supported for now. */	2384	/* Also remember that multiparts objects are not supported for now. */
2490
2491	object *	2385	object *
2492	load_object_str (const char *obstr)	2386	load_object_str (const char *obstr)
2493	{	2387	{
2494	object *op;	2388	object *op;
2495	char filename[MAX_BUF];	2389	char filename[MAX_BUF];
…		…
2525	* returns NULL if no match.	2419	* returns NULL if no match.
2526	*/	2420	*/
2527	object *	2421	object *
2528	find_obj_by_type_subtype (const object *who, int type, int subtype)	2422	find_obj_by_type_subtype (const object *who, int type, int subtype)
2529	{	2423	{
2530	object *tmp;
2531
2532	for (tmp = who->inv; tmp; tmp = tmp->below)	2424	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2533	if (tmp->type == type && tmp->subtype == subtype)	2425	if (tmp->type == type && tmp->subtype == subtype)
2534	return tmp;	2426	return tmp;
2535		2427
2536	return NULL;	2428	return 0;
2537	}	2429	}
2538		2430
2539	/* If ob has a field named key, return the link from the list,	2431	/* If ob has a field named key, return the link from the list,
2540	* otherwise return NULL.	2432	* otherwise return NULL.
2541	*	2433	*
…		…
2543	* do the desired thing.	2435	* do the desired thing.
2544	*/	2436	*/
2545	key_value *	2437	key_value *
2546	get_ob_key_link (const object ob, const char key)	2438	get_ob_key_link (const object ob, const char key)
2547	{	2439	{
2548	key_value *link;
2549
2550	for (link = ob->key_values; link != NULL; link = link->next)	2440	for (key_value *link = ob->key_values; link; link = link->next)
2551	if (link->key == key)	2441	if (link->key == key)
2552	return link;	2442	return link;
2553		2443
2554	return NULL;	2444	return 0;
2555	}	2445	}
2556		2446
2557	/*	2447	/*
2558	* Returns the value of op has an extra_field for key, or NULL.	2448	* Returns the value of op has an extra_field for key, or NULL.
2559	*	2449	*
…		…
2599	* Returns TRUE on success.	2489	* Returns TRUE on success.
2600	*/	2490	*/
2601	int	2491	int
2602	set_ob_key_value_s (object op, const shstr & canonical_key, const char value, int add_key)	2492	set_ob_key_value_s (object op, const shstr & canonical_key, const char value, int add_key)
2603	{	2493	{
2604	key_value *
2605	field = NULL, *last = NULL;	2494	key_value field = NULL, last = NULL;
2606		2495
2607	for (field = op->key_values; field != NULL; field = field->next)	2496	for (field = op->key_values; field != NULL; field = field->next)
2608	{	2497	{
2609	if (field->key != canonical_key)	2498	if (field->key != canonical_key)
2610	{	2499	{
…		…
2638	/* IF we get here, key doesn't exist */	2527	/* IF we get here, key doesn't exist */
2639		2528
2640	/* No field, we'll have to add it. */	2529	/* No field, we'll have to add it. */
2641		2530
2642	if (!add_key)	2531	if (!add_key)
2643	{
2644	return FALSE;	2532	return FALSE;
2645	}	2533
2646	/* There isn't any good reason to store a null	2534	/* There isn't any good reason to store a null
2647	* value in the key/value list. If the archetype has	2535	* value in the key/value list. If the archetype has
2648	* this key, then we should also have it, so shouldn't	2536	* this key, then we should also have it, so shouldn't
2649	* be here. If user wants to store empty strings,	2537	* be here. If user wants to store empty strings,
2650	* should pass in ""	2538	* should pass in ""

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.76 by root, Thu Dec 21 01:33:49 2006 UTC vs. Revision 1.91 by elmex, Tue Dec 26 10:51:52 2006 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.76 by root, Thu Dec 21 01:33:49 2006 UTC vs.
Revision 1.91 by elmex, Tue Dec 26 10:51:52 2006 UTC