ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.47 by root, Thu Sep 14 22:33:59 2006 UTC vs.
Revision 1.151 by root, Wed May 16 11:10:01 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	23	*/
23		24
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	26	sub/add_weight will transcend the environment updating the carrying
26	variable. */	27	variable. */
27	#include <global.h>	28	#include <global.h>
28	#include <stdio.h>	29	#include <stdio.h>
29	#include <sys/types.h>	30	#include <sys/types.h>
30	#include <sys/uio.h>	31	#include <sys/uio.h>
31	#include <object.h>	32	#include <object.h>
32	#include <funcpoint.h>	33	#include <funcpoint.h>
		34	#include <sproto.h>
33	#include <loader.h>	35	#include <loader.h>
		36
		37	#include <bitset>
34		38
35	int nrofallocobjects = 0;	39	int nrofallocobjects = 0;
36	static UUID uuid;	40	static UUID uuid;
37	const uint64 UUID_SKIP = 1<<19;	41	const uint64 UUID_SKIP = 1<<19;
38		42
39	object *active_objects; /* List of active objects that need to be processed */	43	objectvec objects;
		44	activevec actives;
40		45
41	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	46	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
42	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	47	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
43	};	48	};
44	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	49	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
…		…
104	_exit (1);	109	_exit (1);
105	}	110	}
106		111
107	uuid.seq = uid;	112	uuid.seq = uid;
108	write_uuid ();	113	write_uuid ();
109	LOG (llevDebug, "read UID: %lld\n", uid);	114	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
110	fclose (fp);	115	fclose (fp);
111	}	116	}
112		117
113	UUID	118	UUID
114	gen_uuid ()	119	gen_uuid ()
…		…
139	* objects with lists are rare, and lists stay short. If not, use a	144	* objects with lists are rare, and lists stay short. If not, use a
140	* different structure or at least keep the lists sorted...	145	* different structure or at least keep the lists sorted...
141	*/	146	*/
142		147
143	/* For each field in wants, */	148	/* For each field in wants, */
144	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	149	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
145	{	150	{
146	key_value *has_field;	151	key_value *has_field;
147		152
148	/* Look for a field in has with the same key. */	153	/* Look for a field in has with the same key. */
149	has_field = get_ob_key_link (has, wants_field->key);	154	has_field = get_ob_key_link (has, wants_field->key);
…		…
183	*	188	*
184	* Note that this function appears a lot longer than the macro it	189	* Note that this function appears a lot longer than the macro it
185	* replaces - this is mostly for clarity - a decent compiler should hopefully	190	* replaces - this is mostly for clarity - a decent compiler should hopefully
186	* reduce this to the same efficiency.	191	* reduce this to the same efficiency.
187	*	192	*
188	* Check nrof variable *before* calling CAN_MERGE()	193	* Check nrof variable *before* calling can_merge()
189	*	194	*
190	* Improvements made with merge: Better checking on potion, and also	195	* Improvements made with merge: Better checking on potion, and also
191	* check weight	196	* check weight
192	*/	197	*/
193
194	bool object::can_merge (object *ob1, object *ob2)	198	bool object::can_merge_slow (object *ob1, object *ob2)
195	{	199	{
196	/* A couple quicksanity checks */	200	/* A couple quicksanity checks */
197	if ((ob1 == ob2) || (ob1->type != ob2->type))	201	if (ob1 == ob2
		202	|| ob1->type != ob2->type
		203	|| ob1->speed != ob2->speed
		204	|| ob1->value != ob2->value
		205	|| ob1->name != ob2->name)
198	return 0;	206	return 0;
199		207
200	if (ob1->speed != ob2->speed)	208	//TODO: this ain't working well, use nicer and correct overflow check
201	return 0;
202
203	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	209	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
204	* value could not be stored in a sint32 (which unfortunately sometimes is	210	* value could not be stored in a sint32 (which unfortunately sometimes is
205	* used to store nrof).	211	* used to store nrof).
206	*/	212	*/
207	if (ob1->nrof + ob2->nrof >= 1UL << 31)	213	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
217	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	223	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
218		224
219	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	225	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
220	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	226	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
221		227
222		228	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
223	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	229	|| ob1->arch != ob2->arch
224	* being locked in inventory should prevent merging.
225	* 0x4 in flags3 is CLIENT_SENT
226	*/
227	if ((ob1->arch != ob2->arch) ||
228	(ob1->flags[0] != ob2->flags[0]) ||
229	(ob1->flags[1] != ob2->flags[1]) ||
230	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
231	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
232	(ob1->name != ob2->name) ||	230	|| ob1->name != ob2->name
233	(ob1->title != ob2->title) ||	231	|| ob1->title != ob2->title
234	(ob1->msg != ob2->msg) ||	232	|| ob1->msg != ob2->msg
235	(ob1->weight != ob2->weight) ||	233	|| ob1->weight != ob2->weight
236	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	234	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
237	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	235	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
238	(ob1->attacktype != ob2->attacktype) ||	236	|| ob1->attacktype != ob2->attacktype
239	(ob1->magic != ob2->magic) ||	237	|| ob1->magic != ob2->magic
240	(ob1->slaying != ob2->slaying) ||	238	|| ob1->slaying != ob2->slaying
241	(ob1->skill != ob2->skill) ||	239	|| ob1->skill != ob2->skill
242	(ob1->value != ob2->value) ||	240	|| ob1->value != ob2->value
243	(ob1->animation_id != ob2->animation_id) ||	241	|| ob1->animation_id != ob2->animation_id
244	(ob1->client_type != ob2->client_type) ||	242	|| ob1->client_type != ob2->client_type
245	(ob1->materialname != ob2->materialname) ||	243	|| ob1->materialname != ob2->materialname
246	(ob1->lore != ob2->lore) ||	244	|| ob1->lore != ob2->lore
247	(ob1->subtype != ob2->subtype) ||	245	|| ob1->subtype != ob2->subtype
248	(ob1->move_type != ob2->move_type) ||	246	|| ob1->move_type != ob2->move_type
249	(ob1->move_block != ob2->move_block) ||	247	|| ob1->move_block != ob2->move_block
250	(ob1->move_allow != ob2->move_allow) ||	248	|| ob1->move_allow != ob2->move_allow
251	(ob1->move_on != ob2->move_on) ||	249	|| ob1->move_on != ob2->move_on
252	(ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty))	250	|| ob1->move_off != ob2->move_off
		251	|| ob1->move_slow != ob2->move_slow
		252	|| ob1->move_slow_penalty != ob2->move_slow_penalty)
253	return 0;	253	return 0;
254		254
255	/* This is really a spellbook check - really, we should	255	/* This is really a spellbook check - really, we should
256	* check all objects in the inventory.	256	* check all objects in the inventory.
257	*/	257	*/
…		…
260	/* if one object has inventory but the other doesn't, not equiv */	260	/* if one object has inventory but the other doesn't, not equiv */
261	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	261	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
262	return 0;	262	return 0;
263		263
264	/* Now check to see if the two inventory objects could merge */	264	/* Now check to see if the two inventory objects could merge */
265	if (!CAN_MERGE (ob1->inv, ob2->inv))	265	if (!object::can_merge (ob1->inv, ob2->inv))
266	return 0;	266	return 0;
267		267
268	/* inventory ok - still need to check rest of this object to see	268	/* inventory ok - still need to check rest of this object to see
269	* if it is valid.	269	* if it is valid.
270	*/	270	*/
…		…
279		279
280	/* Note sure why the following is the case - either the object has to	280	/* Note sure why the following is the case - either the object has to
281	* be animated or have a very low speed. Is this an attempted monster	281	* be animated or have a very low speed. Is this an attempted monster
282	* check?	282	* check?
283	*/	283	*/
284	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	284	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
285	return 0;	285	return 0;
286		286
287	switch (ob1->type)	287	switch (ob1->type)
288	{	288	{
289	case SCROLL:	289	case SCROLL:
…		…
325	sum_weight (object *op)	325	sum_weight (object *op)
326	{	326	{
327	long sum;	327	long sum;
328	object *inv;	328	object *inv;
329		329
330	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	330	for (sum = 0, inv = op->inv; inv; inv = inv->below)
331	{	331	{
332	if (inv->inv)	332	if (inv->inv)
333	sum_weight (inv);	333	sum_weight (inv);
		334
334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	335	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
335	}	336	}
336		337
337	if (op->type == CONTAINER && op->stats.Str)	338	if (op->type == CONTAINER && op->stats.Str)
338	sum = (sum * (100 - op->stats.Str)) / 100;	339	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
354	op = op->env;	355	op = op->env;
355	return op;	356	return op;
356	}	357	}
357		358
358	/*	359	/*
359	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
360	* a better check. We basically keeping traversing up until we can't
361	* or find a player.
362	*/
363
364	object *
365	is_player_inv (object *op)
366	{
367	for (; op != NULL && op->type != PLAYER; op = op->env)
368	if (op->env == op)
369	op->env = NULL;
370	return op;
371	}
372
373	/*
374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	360	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
375	* Some error messages.	361	* Some error messages.
376	* The result of the dump is stored in the static global errmsg array.	362	* The result of the dump is stored in the static global errmsg array.
377	*/	363	*/
378		364	char *
379	void
380	dump_object2 (object *op)
381	{
382	errmsg[0] = 0;
383	return;
384	//TODO//D#d#
385	#if 0
386	char *cp;
387
388	/* object *tmp;*/
389
390	if (op->arch != NULL)
391	{
392	strcat (errmsg, "arch ");
393	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
394	strcat (errmsg, "\n");
395	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
396	strcat (errmsg, cp);
397	# if 0
398	/* Don't dump player diffs - they are too long, mostly meaningless, and
399	* will overflow the buffer.
400	* Changed so that we don't dump inventory either. This may
401	* also overflow the buffer.
402	*/
403	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
404	strcat (errmsg, cp);
405	for (tmp = op->inv; tmp; tmp = tmp->below)
406	dump_object2 (tmp);
407	# endif
408	strcat (errmsg, "end\n");
409	}
410	else
411	{
412	strcat (errmsg, "Object ");
413	if (op->name == NULL)
414	strcat (errmsg, "(null)");
415	else
416	strcat (errmsg, op->name);
417	strcat (errmsg, "\n");
418	# if 0
419	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
420	strcat (errmsg, cp);
421	for (tmp = op->inv; tmp; tmp = tmp->below)
422	dump_object2 (tmp);
423	# endif
424	strcat (errmsg, "end\n");
425	}
426	#endif
427	}
428
429	/*
430	* Dumps an object. Returns output in the static global errmsg array.
431	*/
432
433	void
434	dump_object (object *op)	365	dump_object (object *op)
435	{	366	{
436	if (op == NULL)	367	if (!op)
437	{	368	return strdup ("[NULLOBJ]");
438	strcpy (errmsg, "[NULL pointer]");
439	return;
440	}
441	errmsg[0] = '\0';
442	dump_object2 (op);
443	}
444		369
445	void	370	object_freezer freezer;
446	dump_all_objects (void)	371	op->write (freezer);
447	{	372	return freezer.as_string ();
448	object *op;
449
450	for (op = object::first; op != NULL; op = op->next)
451	{
452	dump_object (op);
453	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
454	}
455	}	373	}
456		374
457	/*	375	/*
458	* get_nearest_part(multi-object, object 2) returns the part of the	376	* get_nearest_part(multi-object, object 2) returns the part of the
459	* multi-object 1 which is closest to the second object.	377	* multi-object 1 which is closest to the second object.
…		…
475	}	393	}
476		394
477	/*	395	/*
478	* Returns the object which has the count-variable equal to the argument.	396	* Returns the object which has the count-variable equal to the argument.
479	*/	397	*/
480
481	object *	398	object *
482	find_object (tag_t i)	399	find_object (tag_t i)
483	{	400	{
484	object *op;	401	for_all_objects (op)
485
486	for (op = object::first; op != NULL; op = op->next)
487	if (op->count == i)	402	if (op->count == i)
488	break;
489	return op;	403	return op;
		404
		405	return 0;
490	}	406	}
491		407
492	/*	408	/*
493	* Returns the first object which has a name equal to the argument.	409	* Returns the first object which has a name equal to the argument.
494	* Used only by the patch command, but not all that useful.	410	* Used only by the patch command, but not all that useful.
495	* Enables features like "patch <name-of-other-player> food 999"	411	* Enables features like "patch <name-of-other-player> food 999"
496	*/	412	*/
497
498	object *	413	object *
499	find_object_name (const char *str)	414	find_object_name (const char *str)
500	{	415	{
501	shstr_cmp str_ (str);	416	shstr_cmp str_ (str);
502	object *op;	417	object *op;
503		418
504	for (op = object::first; op != NULL; op = op->next)	419	for_all_objects (op)
505	if (op->name == str_)	420	if (op->name == str_)
506	break;	421	break;
507		422
508	return op;	423	return op;
509	}	424	}
…		…
535	owner = owner->owner;	450	owner = owner->owner;
536		451
537	this->owner = owner;	452	this->owner = owner;
538	}	453	}
539		454
		455	int
		456	object::slottype () const
		457	{
		458	if (type == SKILL)
		459	{
		460	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		461	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		462	}
		463	else
		464	{
		465	if (slot [body_combat].info) return slot_combat;
		466	if (slot [body_range ].info) return slot_ranged;
		467	}
		468
		469	return slot_none;
		470	}
		471
		472	bool
		473	object::change_weapon (object *ob)
		474	{
		475	if (current_weapon == ob)
		476	return true;
		477
		478	if (chosen_skill)
		479	chosen_skill->flag [FLAG_APPLIED] = false;
		480
		481	current_weapon = ob;
		482	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		483
		484	if (chosen_skill)
		485	chosen_skill->flag [FLAG_APPLIED] = true;
		486
		487	update_stats ();
		488
		489	if (ob)
		490	{
		491	// now check wether any body locations became invalid, in which case
		492	// we cannot apply the weapon at the moment.
		493	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		494	if (slot[i].used < 0)
		495	{
		496	current_weapon = chosen_skill = 0;
		497	update_stats ();
		498
		499	new_draw_info_format (NDI_UNIQUE, 0, this,
		500	"You try to balance your applied items all at once, but the %s is too much. "
		501	"You need to unapply some items first.", &ob->name);
		502	return false;
		503	}
		504
		505	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		506	}
		507	else
		508	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		509
		510	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		511	{
		512	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		513	&name, ob->debug_desc ());
		514	return false;
		515	}
		516
		517	return true;
		518	}
		519
540	/* Zero the key_values on op, decrementing the shared-string	520	/* Zero the key_values on op, decrementing the shared-string
541	* refcounts and freeing the links.	521	* refcounts and freeing the links.
542	*/	522	*/
543	static void	523	static void
544	free_key_values (object *op)	524	free_key_values (object *op)
545	{	525	{
546	for (key_value *i = op->key_values; i != 0;)	526	for (key_value *i = op->key_values; i; )
547	{	527	{
548	key_value *next = i->next;	528	key_value *next = i->next;
549	delete i;	529	delete i;
550		530
551	i = next;	531	i = next;
552	}	532	}
553		533
554	op->key_values = 0;	534	op->key_values = 0;
555	}	535	}
556		536
557	void object::clear ()	537	object &
		538	object::operator =(const object &src)
558	{	539	{
559	attachable_base::clear ();	540	bool is_freed = flag [FLAG_FREED];
		541	bool is_removed = flag [FLAG_REMOVED];
560		542
561	free_key_values (this);	543	*(object_copy *)this = src;
562		544
563	owner = 0;	545	flag [FLAG_FREED] = is_freed;
564	name = 0;	546	flag [FLAG_REMOVED] = is_removed;
565	name_pl = 0;
566	title = 0;
567	race = 0;
568	slaying = 0;
569	skill = 0;
570	msg = 0;
571	lore = 0;
572	custom_name = 0;
573	materialname = 0;
574	contr = 0;
575	below = 0;
576	above = 0;
577	inv = 0;
578	container = 0;
579	env = 0;
580	more = 0;
581	head = 0;
582	map = 0;
583	active_next = 0;
584	active_prev = 0;
585
586	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
587
588	SET_FLAG (this, FLAG_REMOVED);
589
590	/* What is not cleared is next, prev, and count */
591
592	expmul = 1.0;
593	face = blank_face;
594
595	if (settings.casting_time)
596	casting_time = -1;
597	}
598
599	void object::clone (object *destination)
600	{
601	*(object_copy *)destination = *this;
602	*(object_pod *)destination = *this;
603
604	if (self || cb)
605	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
606	}
607
608	/*
609	* copy object first frees everything allocated by the second object,
610	* and then copies the contends of the first object into the second
611	* object, allocating what needs to be allocated. Basically, any
612	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
613	* if the first object is freed, the pointers in the new object
614	* will point at garbage.
615	*/
616	void
617	copy_object (object *op2, object *op)
618	{
619	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
620	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
621
622	op2->clone (op);
623
624	if (is_freed)
625	SET_FLAG (op, FLAG_FREED);
626	if (is_removed)
627	SET_FLAG (op, FLAG_REMOVED);
628
629	if (op2->speed < 0)
630	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
631		547
632	/* Copy over key_values, if any. */	548	/* Copy over key_values, if any. */
633	if (op2->key_values)	549	if (src.key_values)
634	{	550	{
635	key_value *tail = 0;	551	key_value *tail = 0;
636	key_value *i;
637
638	op->key_values = 0;	552	key_values = 0;
639		553
640	for (i = op2->key_values; i; i = i->next)	554	for (key_value *i = src.key_values; i; i = i->next)
641	{	555	{
642	key_value *new_link = new key_value;	556	key_value *new_link = new key_value;
643		557
644	new_link->next = 0;	558	new_link->next = 0;
645	new_link->key = i->key;	559	new_link->key = i->key;
646	new_link->value = i->value;	560	new_link->value = i->value;
647		561
648	/* Try and be clever here, too. */	562	/* Try and be clever here, too. */
649	if (!op->key_values)	563	if (!key_values)
650	{	564	{
651	op->key_values = new_link;	565	key_values = new_link;
652	tail = new_link;	566	tail = new_link;
653	}	567	}
654	else	568	else
655	{	569	{
656	tail->next = new_link;	570	tail->next = new_link;
657	tail = new_link;	571	tail = new_link;
658	}	572	}
659	}	573	}
660	}	574	}
		575	}
661		576
662	update_ob_speed (op);	577	/*
		578	* copy_to first frees everything allocated by the dst object,
		579	* and then copies the contents of itself into the second
		580	* object, allocating what needs to be allocated. Basically, any
		581	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		582	* if the first object is freed, the pointers in the new object
		583	* will point at garbage.
		584	*/
		585	void
		586	object::copy_to (object *dst)
		587	{
		588	*dst = *this;
		589
		590	if (speed < 0)
		591	dst->speed_left = speed_left - rndm ();
		592
		593	dst->set_speed (dst->speed);
		594	}
		595
		596	void
		597	object::instantiate ()
		598	{
		599	if (!uuid.seq) // HACK
		600	uuid = gen_uuid ();
		601
		602	speed_left = -0.1f;
		603	/* copy the body_info to the body_used - this is only really
		604	* need for monsters, but doesn't hurt to do it for everything.
		605	* by doing so, when a monster is created, it has good starting
		606	* values for the body_used info, so when items are created
		607	* for it, they can be properly equipped.
		608	*/
		609	for (int i = NUM_BODY_LOCATIONS; i--; )
		610	slot[i].used = slot[i].info;
		611
		612	attachable::instantiate ();
		613	}
		614
		615	object *
		616	object::clone ()
		617	{
		618	object *neu = create ();
		619	copy_to (neu);
		620	return neu;
663	}	621	}
664		622
665	/*	623	/*
666	* If an object with the IS_TURNABLE() flag needs to be turned due	624	* If an object with the IS_TURNABLE() flag needs to be turned due
667	* to the closest player being on the other side, this function can	625	* to the closest player being on the other side, this function can
668	* be called to update the face variable, _and_ how it looks on the map.	626	* be called to update the face variable, _and_ how it looks on the map.
669	*/	627	*/
670
671	void	628	void
672	update_turn_face (object *op)	629	update_turn_face (object *op)
673	{	630	{
674	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	631	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
675	return;	632	return;
		633
676	SET_ANIMATION (op, op->direction);	634	SET_ANIMATION (op, op->direction);
677	update_object (op, UP_OBJ_FACE);	635	update_object (op, UP_OBJ_FACE);
678	}	636	}
679		637
680	/*	638	/*
681	* Updates the speed of an object. If the speed changes from 0 to another	639	* Updates the speed of an object. If the speed changes from 0 to another
682	* value, or vice versa, then add/remove the object from the active list.	640	* value, or vice versa, then add/remove the object from the active list.
683	* This function needs to be called whenever the speed of an object changes.	641	* This function needs to be called whenever the speed of an object changes.
684	*/	642	*/
685	void	643	void
686	update_ob_speed (object *op)	644	object::set_speed (float speed)
687	{	645	{
688	extern int arch_init;	646	if (flag [FLAG_FREED] && speed)
689
690	/* No reason putting the archetypes objects on the speed list,
691	* since they never really need to be updated.
692	*/
693
694	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
695	{	647	{
696	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	648	LOG (llevError, "Object %s is freed but has speed.\n", &name);
697	#ifdef MANY_CORES
698	abort ();
699	#else
700	op->speed = 0;	649	speed = 0;
701	#endif
702	}
703
704	if (arch_init)
705	return;
706
707	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
708	{	650	}
709	/* If already on active list, don't do anything */
710	if (op->active_next || op->active_prev || op == active_objects)
711	return;
712		651
713	/* process_events() expects us to insert the object at the beginning	652	this->speed = speed;
714	* of the list. */
715	op->active_next = active_objects;
716		653
717	if (op->active_next != NULL)	654	if (has_active_speed ())
718	op->active_next->active_prev = op;	655	activate ();
719
720	active_objects = op;
721	}
722	else	656	else
723	{	657	deactivate ();
724	/* If not on the active list, nothing needs to be done */
725	if (!op->active_next && !op->active_prev && op != active_objects)
726	return;
727
728	if (op->active_prev == NULL)
729	{
730	active_objects = op->active_next;
731
732	if (op->active_next != NULL)
733	op->active_next->active_prev = NULL;
734	}
735	else
736	{
737	op->active_prev->active_next = op->active_next;
738
739	if (op->active_next)
740	op->active_next->active_prev = op->active_prev;
741	}
742
743	op->active_next = NULL;
744	op->active_prev = NULL;
745	}
746	}	658	}
747		659
748	/* This function removes object 'op' from the list of active
749	* objects.
750	* This should only be used for style maps or other such
751	* reference maps where you don't want an object that isn't
752	* in play chewing up cpu time getting processed.
753	* The reverse of this is to call update_ob_speed, which
754	* will do the right thing based on the speed of the object.
755	*/
756	void
757	remove_from_active_list (object *op)
758	{
759	/* If not on the active list, nothing needs to be done */
760	if (!op->active_next && !op->active_prev && op != active_objects)
761	return;
762
763	if (op->active_prev == NULL)
764	{
765	active_objects = op->active_next;
766	if (op->active_next != NULL)
767	op->active_next->active_prev = NULL;
768	}
769	else
770	{
771	op->active_prev->active_next = op->active_next;
772	if (op->active_next)
773	op->active_next->active_prev = op->active_prev;
774	}
775	op->active_next = NULL;
776	op->active_prev = NULL;
777	}
778
779	/*	660	/*
780	* update_object() updates the array which represents the map.	661	* update_object() updates the the map.
781	* It takes into account invisible objects (and represent squares covered	662	* It takes into account invisible objects (and represent squares covered
782	* by invisible objects by whatever is below them (unless it's another	663	* by invisible objects by whatever is below them (unless it's another
783	* invisible object, etc...)	664	* invisible object, etc...)
784	* If the object being updated is beneath a player, the look-window	665	* If the object being updated is beneath a player, the look-window
785	* of that player is updated (this might be a suboptimal way of	666	* of that player is updated (this might be a suboptimal way of
786	* updating that window, though, since update_object() is called _often_)	667	* updating that window, though, since update_object() is called _often_)
787	*	668	*
788	* action is a hint of what the caller believes need to be done.	669	* action is a hint of what the caller believes need to be done.
789	* For example, if the only thing that has changed is the face (due to
790	* an animation), we don't need to call update_position until that actually
791	* comes into view of a player. OTOH, many other things, like addition/removal
792	* of walls or living creatures may need us to update the flags now.
793	* current action are:	670	* current action are:
794	* UP_OBJ_INSERT: op was inserted	671	* UP_OBJ_INSERT: op was inserted
795	* UP_OBJ_REMOVE: op was removed	672	* UP_OBJ_REMOVE: op was removed
796	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	673	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
797	* as that is easier than trying to look at what may have changed.	674	* as that is easier than trying to look at what may have changed.
798	* UP_OBJ_FACE: only the objects face has changed.	675	* UP_OBJ_FACE: only the objects face has changed.
799	*/	676	*/
800
801	void	677	void
802	update_object (object *op, int action)	678	update_object (object *op, int action)
803	{	679	{
804	int update_now = 0, flags;
805	MoveType move_on, move_off, move_block, move_slow;
806
807	if (op == NULL)	680	if (op == NULL)
808	{	681	{
809	/* this should never happen */	682	/* this should never happen */
810	LOG (llevDebug, "update_object() called for NULL object.\n");	683	LOG (llevDebug, "update_object() called for NULL object.\n");
811	return;	684	return;
812	}	685	}
813		686
814	if (op->env != NULL)	687	if (op->env)
815	{	688	{
816	/* Animation is currently handled by client, so nothing	689	/* Animation is currently handled by client, so nothing
817	* to do in this case.	690	* to do in this case.
818	*/	691	*/
819	return;	692	return;
…		…
824	*/	697	*/
825	if (!op->map || op->map->in_memory == MAP_SAVING)	698	if (!op->map || op->map->in_memory == MAP_SAVING)
826	return;	699	return;
827		700
828	/* make sure the object is within map boundaries */	701	/* make sure the object is within map boundaries */
829	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	702	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
830	{	703	{
831	LOG (llevError, "update_object() called for object out of map!\n");	704	LOG (llevError, "update_object() called for object out of map!\n");
832	#ifdef MANY_CORES	705	#ifdef MANY_CORES
833	abort ();	706	abort ();
834	#endif	707	#endif
835	return;	708	return;
836	}	709	}
837		710
838	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	711	mapspace &m = op->ms ();
839	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
840	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
841	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
842	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
843	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
844		712
		713	if (!(m.flags_ & P_UPTODATE))
		714	/* nop */;
845	if (action == UP_OBJ_INSERT)	715	else if (action == UP_OBJ_INSERT)
846	{	716	{
		717	// this is likely overkill, TODO: revisit (schmorp)
847	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	718	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
848	update_now = 1;
849
850	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	719	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
851	update_now = 1;	720	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
852		721	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		722	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
853	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	723	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
854	update_now = 1;
855
856	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
857	update_now = 1;
858
859	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
860	update_now = 1;
861
862	if ((move_on | op->move_on) != move_on)	724	|| (m.move_on | op->move_on ) != m.move_on
863	update_now = 1;
864
865	if ((move_off | op->move_off) != move_off)	725	|| (m.move_off | op->move_off ) != m.move_off
866	update_now = 1;	726	|| (m.move_slow | op->move_slow) != m.move_slow
867
868	/* This isn't perfect, but I don't expect a lot of objects to	727	/* This isn't perfect, but I don't expect a lot of objects to
869	* to have move_allow right now.	728	* to have move_allow right now.
870	*/	729	*/
871	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	730	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
872	update_now = 1;	731	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
873		732	m.flags_ = 0;
874	if ((move_slow | op->move_slow) != move_slow)
875	update_now = 1;
876	}	733	}
877	/* if the object is being removed, we can't make intelligent	734	/* if the object is being removed, we can't make intelligent
878	* decisions, because remove_ob can't really pass the object	735	* decisions, because remove_ob can't really pass the object
879	* that is being removed.	736	* that is being removed.
880	*/	737	*/
881	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	738	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
882	update_now = 1;	739	m.flags_ = 0;
883	else if (action == UP_OBJ_FACE)	740	else if (action == UP_OBJ_FACE)
884	/* Nothing to do for that case */ ;	741	/* Nothing to do for that case */ ;
885	else	742	else
886	LOG (llevError, "update_object called with invalid action: %d\n", action);	743	LOG (llevError, "update_object called with invalid action: %d\n", action);
887		744
888	if (update_now)
889	{
890	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
891	update_position (op->map, op->x, op->y);
892	}
893
894	if (op->more != NULL)	745	if (op->more)
895	update_object (op->more, action);	746	update_object (op->more, action);
896	}
897
898	object::vector object::mortals;
899	object::vector object::objects; // not yet used
900	object *object::first;
901
902	void object::free_mortals ()
903	{
904	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
905	if ((*i)->refcnt)
906	++i; // further delay freeing
907	else
908	{
909	delete *i;
910	mortals.erase (i);
911	}
912
913	static int lastmortals = 0;//D
914
915	if (mortals.size() != lastmortals)//D
916	{
917	lastmortals = mortals.size ();//D
918	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
919	}
920	}	747	}
921		748
922	object::object ()	749	object::object ()
923	{	750	{
924	SET_FLAG (this, FLAG_REMOVED);	751	SET_FLAG (this, FLAG_REMOVED);
…		…
927	face = blank_face;	754	face = blank_face;
928	}	755	}
929		756
930	object::~object ()	757	object::~object ()
931	{	758	{
		759	unlink ();
		760
932	free_key_values (this);	761	free_key_values (this);
933	}	762	}
934		763
		764	static int object_count;
		765
935	void object::link ()	766	void object::link ()
936	{	767	{
937	count = ++ob_count;	768	assert (!index);//D
938	uuid = gen_uuid ();	769	uuid = gen_uuid ();
		770	count = ++object_count;
939		771
940	prev = 0;	772	refcnt_inc ();
941	next = object::first;	773	objects.insert (this);
942
943	if (object::first)
944	object::first->prev = this;
945
946	object::first = this;
947	}	774	}
948		775
949	void object::unlink ()	776	void object::unlink ()
950	{	777	{
951	//count = 0;//D	778	if (!index)
952	if (!prev && !next) return;//D	779	return;
953		780
954	if (this == object::first)	781	objects.erase (this);
955	object::first = next;	782	refcnt_dec ();
		783	}
956		784
957	/* Remove this object from the list of used objects */	785	void
958	if (prev) prev->next = next;	786	object::activate ()
959	if (next) next->prev = prev;	787	{
		788	/* If already on active list, don't do anything */
		789	if (active)
		790	return;
960		791
961	prev = 0;	792	if (has_active_speed ())
962	next = 0;	793	actives.insert (this);
		794	}
		795
		796	void
		797	object::activate_recursive ()
		798	{
		799	activate ();
		800
		801	for (object *op = inv; op; op = op->below)
		802	op->activate_recursive ();
		803	}
		804
		805	/* This function removes object 'op' from the list of active
		806	* objects.
		807	* This should only be used for style maps or other such
		808	* reference maps where you don't want an object that isn't
		809	* in play chewing up cpu time getting processed.
		810	* The reverse of this is to call update_ob_speed, which
		811	* will do the right thing based on the speed of the object.
		812	*/
		813	void
		814	object::deactivate ()
		815	{
		816	/* If not on the active list, nothing needs to be done */
		817	if (!active)
		818	return;
		819
		820	actives.erase (this);
		821	}
		822
		823	void
		824	object::deactivate_recursive ()
		825	{
		826	for (object *op = inv; op; op = op->below)
		827	op->deactivate_recursive ();
		828
		829	deactivate ();
		830	}
		831
		832	void
		833	object::set_flag_inv (int flag, int value)
		834	{
		835	for (object *op = inv; op; op = op->below)
		836	{
		837	op->flag [flag] = value;
		838	op->set_flag_inv (flag, value);
		839	}
		840	}
		841
		842	/*
		843	* Remove and free all objects in the inventory of the given object.
		844	* object.c ?
		845	*/
		846	void
		847	object::destroy_inv (bool drop_to_ground)
		848	{
		849	// need to check first, because the checks below might segfault
		850	// as we might be on an invalid mapspace and crossfire code
		851	// is too buggy to ensure that the inventory is empty.
		852	// corollary: if you create arrows etc. with stuff in tis inventory,
		853	// cf will crash below with off-map x and y
		854	if (!inv)
		855	return;
		856
		857	/* Only if the space blocks everything do we not process -
		858	* if some form of movement is allowed, let objects
		859	* drop on that space.
		860	*/
		861	if (!drop_to_ground
		862	|| !map
		863	|| map->in_memory != MAP_IN_MEMORY
		864	|| map->nodrop
		865	|| ms ().move_block == MOVE_ALL)
		866	{
		867	while (inv)
		868	{
		869	inv->destroy_inv (drop_to_ground);
		870	inv->destroy ();
		871	}
		872	}
		873	else
		874	{ /* Put objects in inventory onto this space */
		875	while (inv)
		876	{
		877	object *op = inv;
		878
		879	if (op->flag [FLAG_STARTEQUIP]
		880	|| op->flag [FLAG_NO_DROP]
		881	|| op->type == RUNE
		882	|| op->type == TRAP
		883	|| op->flag [FLAG_IS_A_TEMPLATE]
		884	|| op->flag [FLAG_DESTROY_ON_DEATH])
		885	op->destroy ();
		886	else
		887	map->insert (op, x, y);
		888	}
		889	}
963	}	890	}
964		891
965	object *object::create ()	892	object *object::create ()
966	{	893	{
967	object *op = new object;	894	object *op = new object;
968	op->link ();	895	op->link ();
969	return op;	896	return op;
970	}	897	}
971		898
972	/*	899	void
973	* free_object() frees everything allocated by an object, removes	900	object::do_destroy ()
974	* it from the list of used objects, and puts it on the list of
975	* free objects. The IS_FREED() flag is set in the object.
976	* The object must have been removed by remove_ob() first for
977	* this function to succeed.
978	*
979	* If free_inventory is set, free inventory as well. Else drop items in
980	* inventory to the ground.
981	*/
982	void object::free (bool free_inventory)
983	{	901	{
984	if (QUERY_FLAG (this, FLAG_FREED))	902	attachable::do_destroy ();
985	return;
986		903
987	if (QUERY_FLAG (this, FLAG_FRIENDLY))	904	if (flag [FLAG_IS_LINKED])
		905	remove_button_link (this);
		906
		907	if (flag [FLAG_FRIENDLY])
988	remove_friendly_object (this);	908	remove_friendly_object (this);
989		909
990	if (!QUERY_FLAG (this, FLAG_REMOVED))	910	if (!flag [FLAG_REMOVED])
991	remove_ob (this);	911	remove ();
992		912
993	SET_FLAG (this, FLAG_FREED);	913	destroy_inv (true);
		914
		915	deactivate ();
		916	unlink ();
		917
		918	flag [FLAG_FREED] = 1;
		919
		920	// hack to ensure that freed objects still have a valid map
		921	{
		922	static maptile *freed_map; // freed objects are moved here to avoid crashes
		923
		924	if (!freed_map)
		925	{
		926	freed_map = new maptile;
		927
		928	freed_map->name = "/internal/freed_objects_map";
		929	freed_map->width = 3;
		930	freed_map->height = 3;
		931
		932	freed_map->alloc ();
		933	freed_map->in_memory = MAP_IN_MEMORY;
		934	}
		935
		936	map = freed_map;
		937	x = 1;
		938	y = 1;
		939	}
		940
		941	head = 0;
994		942
995	if (more)	943	if (more)
996	{	944	{
997	more->free (free_inventory);	945	more->destroy ();
998	more = 0;	946	more = 0;
999	}
1000
1001	if (inv)
1002	{
1003	/* Only if the space blocks everything do we not process -
1004	* if some form of movement is allowed, let objects
1005	* drop on that space.
1006	*/
1007	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1008	{
1009	object *op = inv;
1010
1011	while (op)
1012	{
1013	object *tmp = op->below;
1014	op->free (free_inventory);
1015	op = tmp;
1016	}
1017	}
1018	else
1019	{ /* Put objects in inventory onto this space */
1020	object *op = inv;
1021
1022	while (op)
1023	{
1024	object *tmp = op->below;
1025
1026	remove_ob (op);
1027
1028	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1029	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1030	free_object (op);
1031	else
1032	{
1033	op->x = x;
1034	op->y = y;
1035	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
1036	}
1037
1038	op = tmp;
1039	}
1040	}
1041	}	947	}
1042		948
1043	// clear those pointers that likely might have circular references to us	949	// clear those pointers that likely might have circular references to us
1044	owner = 0;	950	owner = 0;
1045	enemy = 0;	951	enemy = 0;
1046	attacked_by = 0;	952	attacked_by = 0;
		953	}
1047		954
1048	/* Remove object from the active list */	955	void
1049	speed = 0;	956	object::destroy (bool destroy_inventory)
1050	update_ob_speed (this);	957	{
		958	if (destroyed ())
		959	return;
1051		960
1052	unlink ();	961	if (destroy_inventory)
		962	destroy_inv (false);
1053		963
1054	mortals.push_back (this);	964	attachable::destroy ();
1055	}	965	}
1056		966
1057	/*	967	/*
1058	* sub_weight() recursively (outwards) subtracts a number from the	968	* sub_weight() recursively (outwards) subtracts a number from the
1059	* weight of an object (and what is carried by it's environment(s)).	969	* weight of an object (and what is carried by it's environment(s)).
1060	*/	970	*/
1061
1062	void	971	void
1063	sub_weight (object *op, signed long weight)	972	sub_weight (object *op, signed long weight)
1064	{	973	{
1065	while (op != NULL)	974	while (op != NULL)
1066	{	975	{
…		…
1070	op->carrying -= weight;	979	op->carrying -= weight;
1071	op = op->env;	980	op = op->env;
1072	}	981	}
1073	}	982	}
1074		983
1075	/* remove_ob(op):	984	/* op->remove ():
1076	* This function removes the object op from the linked list of objects	985	* This function removes the object op from the linked list of objects
1077	* which it is currently tied to. When this function is done, the	986	* which it is currently tied to. When this function is done, the
1078	* object will have no environment. If the object previously had an	987	* object will have no environment. If the object previously had an
1079	* environment, the x and y coordinates will be updated to	988	* environment, the x and y coordinates will be updated to
1080	* the previous environment.	989	* the previous environment.
1081	* Beware: This function is called from the editor as well!
1082	*/	990	*/
1083
1084	void	991	void
1085	remove_ob (object *op)	992	object::do_remove ()
1086	{	993	{
1087	object *tmp, *last = 0;	994	object *tmp, *last = 0;
1088	object *otmp;	995	object *otmp;
1089		996
1090	tag_t tag;
1091	int check_walk_off;
1092	mapstruct *m;
1093
1094	sint16 x, y;
1095
1096	if (QUERY_FLAG (op, FLAG_REMOVED))	997	if (QUERY_FLAG (this, FLAG_REMOVED))
1097	return;	998	return;
1098		999
1099	SET_FLAG (op, FLAG_REMOVED);	1000	SET_FLAG (this, FLAG_REMOVED);
		1001	INVOKE_OBJECT (REMOVE, this);
1100		1002
1101	if (op->more != NULL)	1003	if (more)
1102	remove_ob (op->more);	1004	more->remove ();
1103		1005
1104	/*	1006	/*
1105	* In this case, the object to be removed is in someones	1007	* In this case, the object to be removed is in someones
1106	* inventory.	1008	* inventory.
1107	*/	1009	*/
1108	if (op->env != NULL)	1010	if (env)
1109	{	1011	{
1110	if (op->nrof)	1012	if (nrof)
1111	sub_weight (op->env, op->weight * op->nrof);	1013	sub_weight (env, weight * nrof);
1112	else	1014	else
1113	sub_weight (op->env, op->weight + op->carrying);	1015	sub_weight (env, weight + carrying);
1114		1016
1115	/* NO_FIX_PLAYER is set when a great many changes are being	1017	/* NO_FIX_PLAYER is set when a great many changes are being
1116	* made to players inventory. If set, avoiding the call	1018	* made to players inventory. If set, avoiding the call
1117	* to save cpu time.	1019	* to save cpu time.
1118	*/	1020	*/
1119	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1021	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1120	fix_player (otmp);	1022	otmp->update_stats ();
1121		1023
1122	if (op->above != NULL)	1024	if (above)
1123	op->above->below = op->below;	1025	above->below = below;
1124	else	1026	else
1125	op->env->inv = op->below;	1027	env->inv = below;
1126		1028
1127	if (op->below != NULL)	1029	if (below)
1128	op->below->above = op->above;	1030	below->above = above;
1129		1031
1130	/* we set up values so that it could be inserted into	1032	/* we set up values so that it could be inserted into
1131	* the map, but we don't actually do that - it is up	1033	* the map, but we don't actually do that - it is up
1132	* to the caller to decide what we want to do.	1034	* to the caller to decide what we want to do.
1133	*/	1035	*/
1134	op->x = op->env->x, op->y = op->env->y;	1036	x = env->x, y = env->y;
1135	op->map = op->env->map;	1037	map = env->map;
1136	op->above = NULL, op->below = NULL;	1038	above = 0, below = 0;
1137	op->env = NULL;	1039	env = 0;
1138	}	1040	}
1139	else if (op->map)	1041	else if (map)
1140	{	1042	{
1141	x = op->x;	1043	if (type == PLAYER)
1142	y = op->y;
1143	m = get_map_from_coord (op->map, &x, &y);
1144
1145	if (!m)
1146	{	1044	{
1147	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1045	// leaving a spot always closes any open container on the ground
1148	op->map->path, op->x, op->y);	1046	if (container && !container->env)
1149	/* in old days, we used to set x and y to 0 and continue.	1047	// this causes spurious floorbox updates, but it ensures
1150	* it seems if we get into this case, something is probablye	1048	// that the CLOSE event is being sent.
1151	* screwed up and should be fixed.	1049	close_container ();
1152	*/	1050
1153	abort ();	1051	--map->players;
		1052	map->touch ();
1154	}	1053	}
1155		1054
1156	if (op->map != m)	1055	map->dirty = true;
1157	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",	1056	mapspace &ms = this->ms ();
1158	op->map->path, m->path, op->x, op->y, x, y);
1159
1160	/* Re did the following section of code - it looks like it had
1161	* lots of logic for things we no longer care about
1162	*/
1163		1057
1164	/* link the object above us */	1058	/* link the object above us */
1165	if (op->above)	1059	if (above)
1166	op->above->below = op->below;	1060	above->below = below;
1167	else	1061	else
1168	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1062	ms.top = below; /* we were top, set new top */
1169		1063
1170	/* Relink the object below us, if there is one */	1064	/* Relink the object below us, if there is one */
1171	if (op->below)	1065	if (below)
1172	op->below->above = op->above;	1066	below->above = above;
1173	else	1067	else
1174	{	1068	{
1175	/* Nothing below, which means we need to relink map object for this space	1069	/* Nothing below, which means we need to relink map object for this space
1176	* use translated coordinates in case some oddness with map tiling is	1070	* use translated coordinates in case some oddness with map tiling is
1177	* evident	1071	* evident
1178	*/	1072	*/
1179	if (GET_MAP_OB (m, x, y) != op)	1073	if (GET_MAP_OB (map, x, y) != this)
1180	{
1181	dump_object (op);
1182	LOG (llevError,
1183	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);	1074	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1184	dump_object (GET_MAP_OB (m, x, y));
1185	LOG (llevError, "%s\n", errmsg);
1186	}
1187		1075
1188	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1076	ms.bot = above; /* goes on above it. */
1189	}	1077	}
1190		1078
1191	op->above = 0;	1079	above = 0;
1192	op->below = 0;	1080	below = 0;
1193		1081
1194	if (op->map->in_memory == MAP_SAVING)	1082	if (map->in_memory == MAP_SAVING)
1195	return;	1083	return;
1196		1084
1197	tag = op->count;	1085	int check_walk_off = !flag [FLAG_NO_APPLY];
1198	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1199		1086
1200	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1087	for (tmp = ms.bot; tmp; tmp = tmp->above)
1201	{	1088	{
1202	/* No point updating the players look faces if he is the object	1089	/* No point updating the players look faces if he is the object
1203	* being removed.	1090	* being removed.
1204	*/	1091	*/
1205		1092
1206	if (tmp->type == PLAYER && tmp != op)	1093	if (tmp->type == PLAYER && tmp != this)
1207	{	1094	{
1208	/* If a container that the player is currently using somehow gets	1095	/* If a container that the player is currently using somehow gets
1209	* removed (most likely destroyed), update the player view	1096	* removed (most likely destroyed), update the player view
1210	* appropriately.	1097	* appropriately.
1211	*/	1098	*/
1212	if (tmp->container == op)	1099	if (tmp->container == this)
1213	{	1100	{
1214	CLEAR_FLAG (op, FLAG_APPLIED);	1101	flag [FLAG_APPLIED] = 0;
1215	tmp->container = NULL;	1102	tmp->container = 0;
1216	}	1103	}
1217		1104
1218	tmp->contr->socket.update_look = 1;	1105	if (tmp->contr->ns)
		1106	tmp->contr->ns->floorbox_update ();
1219	}	1107	}
1220		1108
1221	/* See if player moving off should effect something */	1109	/* See if object moving off should effect something */
1222	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1110	if (check_walk_off
		1111	&& ((move_type & tmp->move_off)
		1112	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1223	{	1113	{
1224	move_apply (tmp, op, NULL);	1114	move_apply (tmp, this, 0);
1225		1115
1226	if (was_destroyed (op, tag))	1116	if (destroyed ())
1227	{
1228	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1117	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1229	}
1230	}	1118	}
1231		1119
1232	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1120	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1233		1121	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1234	if (tmp->above == tmp)	1122	if (tmp->above == tmp)
1235	tmp->above = NULL;	1123	tmp->above = 0;
1236		1124
1237	last = tmp;	1125	last = tmp;
1238	}	1126	}
1239		1127
1240	/* last == NULL of there are no objects on this space */	1128	/* last == NULL if there are no objects on this space */
		1129	//TODO: this makes little sense, why only update the topmost object?
1241	if (last == NULL)	1130	if (!last)
1242	{	1131	map->at (x, y).flags_ = 0;
1243	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1244	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1245	* those out anyways, and if there are any flags set right now, they won't
1246	* be correct anyways.
1247	*/
1248	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1249	update_position (op->map, op->x, op->y);
1250	}
1251	else	1132	else
1252	update_object (last, UP_OBJ_REMOVE);	1133	update_object (last, UP_OBJ_REMOVE);
1253		1134
1254	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1135	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1255	update_all_los (op->map, op->x, op->y);	1136	update_all_los (map, x, y);
1256	}	1137	}
1257	}	1138	}
1258		1139
1259	/*	1140	/*
1260	* merge_ob(op,top):	1141	* merge_ob(op,top):
…		…
1268	merge_ob (object *op, object *top)	1149	merge_ob (object *op, object *top)
1269	{	1150	{
1270	if (!op->nrof)	1151	if (!op->nrof)
1271	return 0;	1152	return 0;
1272		1153
1273	if (top == NULL)	1154	if (top)
1274	for (top = op; top != NULL && top->above != NULL; top = top->above);	1155	for (top = op; top && top->above; top = top->above)
		1156	;
1275		1157
1276	for (; top != NULL; top = top->below)	1158	for (; top; top = top->below)
1277	{	1159	{
1278	if (top == op)	1160	if (top == op)
1279	continue;	1161	continue;
1280	if (CAN_MERGE (op, top))	1162
		1163	if (object::can_merge (op, top))
1281	{	1164	{
1282	top->nrof += op->nrof;	1165	top->nrof += op->nrof;
1283		1166
1284	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1167	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1285	op->weight = 0; /* Don't want any adjustements now */	1168	op->weight = 0; /* Don't want any adjustements now */
1286	remove_ob (op);	1169	op->destroy ();
1287	free_object (op);
1288	return top;	1170	return top;
1289	}	1171	}
1290	}	1172	}
1291		1173
1292	return 0;	1174	return 0;
1293	}	1175	}
1294		1176
		1177	void
		1178	object::expand_tail ()
		1179	{
		1180	if (more)
		1181	return;
		1182
		1183	object *prev = this;
		1184
		1185	for (archetype *at = arch->more; at; at = at->more)
		1186	{
		1187	object *op = arch_to_object (at);
		1188
		1189	op->name = name;
		1190	op->name_pl = name_pl;
		1191	op->title = title;
		1192
		1193	op->head = this;
		1194	prev->more = op;
		1195
		1196	prev = op;
		1197	}
		1198	}
		1199
1295	/*	1200	/*
1296	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1201	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1297	* job preparing multi-part monsters	1202	* job preparing multi-part monsters.
1298	*/	1203	*/
1299	object *	1204	object *
1300	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1205	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1301	{	1206	{
1302	object *tmp;
1303
1304	if (op->head)
1305	op = op->head;
1306
1307	for (tmp = op; tmp; tmp = tmp->more)	1207	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1308	{	1208	{
1309	tmp->x = x + tmp->arch->clone.x;	1209	tmp->x = x + tmp->arch->clone.x;
1310	tmp->y = y + tmp->arch->clone.y;	1210	tmp->y = y + tmp->arch->clone.y;
1311	}	1211	}
1312		1212
…		…
1331	* Return value:	1231	* Return value:
1332	* new object if 'op' was merged with other object	1232	* new object if 'op' was merged with other object
1333	* NULL if 'op' was destroyed	1233	* NULL if 'op' was destroyed
1334	* just 'op' otherwise	1234	* just 'op' otherwise
1335	*/	1235	*/
1336
1337	object *	1236	object *
1338	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1237	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1339	{	1238	{
		1239	assert (!op->flag [FLAG_FREED]);
		1240
1340	object *tmp, *top, *floor = NULL;	1241	object *tmp, *top, *floor = NULL;
1341	sint16 x, y;
1342		1242
1343	if (QUERY_FLAG (op, FLAG_FREED))	1243	op->remove ();
1344	{
1345	LOG (llevError, "Trying to insert freed object!\n");
1346	return NULL;
1347	}
1348		1244
1349	if (m == NULL)	1245	#if 0
1350	{	1246	if (!m->active != !op->active)
1351	dump_object (op);	1247	if (m->active)
1352	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1248	op->activate_recursive ();
1353	return op;	1249	else
1354	}	1250	op->deactivate_recursive ();
		1251	#endif
1355		1252
1356	if (out_of_map (m, op->x, op->y))	1253	if (out_of_map (m, op->x, op->y))
1357	{	1254	{
1358	dump_object (op);
1359	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1255	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1360	#ifdef MANY_CORES	1256	#ifdef MANY_CORES
1361	/* Better to catch this here, as otherwise the next use of this object	1257	/* Better to catch this here, as otherwise the next use of this object
1362	* is likely to cause a crash. Better to find out where it is getting	1258	* is likely to cause a crash. Better to find out where it is getting
1363	* improperly inserted.	1259	* improperly inserted.
1364	*/	1260	*/
1365	abort ();	1261	abort ();
1366	#endif	1262	#endif
1367	return op;	1263	return op;
1368	}	1264	}
1369		1265
1370	if (!QUERY_FLAG (op, FLAG_REMOVED))
1371	{
1372	dump_object (op);
1373	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);
1374	return op;
1375	}
1376
1377	if (op->more != NULL)
1378	{
1379	/* The part may be on a different map. */
1380
1381	object *more = op->more;	1266	if (object *more = op->more)
1382		1267	{
1383	/* We really need the caller to normalize coordinates - if
1384	* we set the map, that doesn't work if the location is within
1385	* a map and this is straddling an edge. So only if coordinate
1386	* is clear wrong do we normalize it.
1387	*/
1388	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1389	more->map = get_map_from_coord (m, &more->x, &more->y);
1390	else if (!more->map)
1391	{
1392	/* For backwards compatibility - when not dealing with tiled maps,
1393	* more->map should always point to the parent.
1394	*/
1395	more->map = m;
1396	}
1397
1398	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1268	if (!insert_ob_in_map (more, m, originator, flag))
1399	{	1269	{
1400	if (!op->head)	1270	if (!op->head)
1401	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1271	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1402		1272
1403	return NULL;	1273	return 0;
1404	}	1274	}
1405	}	1275	}
1406		1276
1407	CLEAR_FLAG (op, FLAG_REMOVED);	1277	CLEAR_FLAG (op, FLAG_REMOVED);
1408		1278
1409	/* Ideally, the caller figures this out. However, it complicates a lot	1279	/* Ideally, the caller figures this out. However, it complicates a lot
1410	* of areas of callers (eg, anything that uses find_free_spot would now	1280	* of areas of callers (eg, anything that uses find_free_spot would now
1411	* need extra work	1281	* need extra work
1412	*/	1282	*/
1413	op->map = get_map_from_coord (m, &op->x, &op->y);	1283	if (!xy_normalise (m, op->x, op->y))
1414	x = op->x;	1284	return 0;
1415	y = op->y;	1285
		1286	op->map = m;
		1287	mapspace &ms = op->ms ();
1416		1288
1417	/* this has to be done after we translate the coordinates.	1289	/* this has to be done after we translate the coordinates.
1418	*/	1290	*/
1419	if (op->nrof && !(flag & INS_NO_MERGE))	1291	if (op->nrof && !(flag & INS_NO_MERGE))
1420	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1292	for (tmp = ms.bot; tmp; tmp = tmp->above)
1421	if (CAN_MERGE (op, tmp))	1293	if (object::can_merge (op, tmp))
1422	{	1294	{
1423	op->nrof += tmp->nrof;	1295	op->nrof += tmp->nrof;
1424	remove_ob (tmp);	1296	tmp->destroy ();
1425	free_object (tmp);
1426	}	1297	}
1427		1298
1428	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1299	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1429	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1300	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1430		1301
…		…
1443	op->below = originator->below;	1314	op->below = originator->below;
1444		1315
1445	if (op->below)	1316	if (op->below)
1446	op->below->above = op;	1317	op->below->above = op;
1447	else	1318	else
1448	SET_MAP_OB (op->map, op->x, op->y, op);	1319	ms.bot = op;
1449		1320
1450	/* since *below* originator, no need to update top */	1321	/* since *below* originator, no need to update top */
1451	originator->below = op;	1322	originator->below = op;
1452	}	1323	}
1453	else	1324	else
1454	{	1325	{
		1326	top = ms.bot;
		1327
1455	/* If there are other objects, then */	1328	/* If there are other objects, then */
1456	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1329	if ((!(flag & INS_MAP_LOAD)) && top)
1457	{	1330	{
1458	object *last = NULL;	1331	object *last = 0;
1459		1332
1460	/*	1333	/*
1461	* If there are multiple objects on this space, we do some trickier handling.	1334	* If there are multiple objects on this space, we do some trickier handling.
1462	* We've already dealt with merging if appropriate.	1335	* We've already dealt with merging if appropriate.
1463	* Generally, we want to put the new object on top. But if	1336	* Generally, we want to put the new object on top. But if
…		…
1467	* once we get to them. This reduces the need to traverse over all of	1340	* once we get to them. This reduces the need to traverse over all of
1468	* them when adding another one - this saves quite a bit of cpu time	1341	* them when adding another one - this saves quite a bit of cpu time
1469	* when lots of spells are cast in one area. Currently, it is presumed	1342	* when lots of spells are cast in one area. Currently, it is presumed
1470	* that flying non pickable objects are spell objects.	1343	* that flying non pickable objects are spell objects.
1471	*/	1344	*/
1472		1345	for (top = ms.bot; top; top = top->above)
1473	while (top != NULL)
1474	{	1346	{
1475	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1347	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1476	floor = top;	1348	floor = top;
1477		1349
1478	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1350	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1481	top = top->below;	1353	top = top->below;
1482	break;	1354	break;
1483	}	1355	}
1484		1356
1485	last = top;	1357	last = top;
1486	top = top->above;
1487	}	1358	}
1488		1359
1489	/* Don't want top to be NULL, so set it to the last valid object */	1360	/* Don't want top to be NULL, so set it to the last valid object */
1490	top = last;	1361	top = last;
1491		1362
…		…
1493	* looks like instead of lots of conditions here.	1364	* looks like instead of lots of conditions here.
1494	* makes things faster, and effectively the same result.	1365	* makes things faster, and effectively the same result.
1495	*/	1366	*/
1496		1367
1497	/* Have object 'fall below' other objects that block view.	1368	/* Have object 'fall below' other objects that block view.
1498	* Unless those objects are exits, type 66	1369	* Unless those objects are exits.
1499	* If INS_ON_TOP is used, don't do this processing	1370	* If INS_ON_TOP is used, don't do this processing
1500	* Need to find the object that in fact blocks view, otherwise	1371	* Need to find the object that in fact blocks view, otherwise
1501	* stacking is a bit odd.	1372	* stacking is a bit odd.
1502	*/	1373	*/
1503	if (!(flag & INS_ON_TOP) &&	1374	if (!(flag & INS_ON_TOP)
1504	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1375	&& ms.flags () & P_BLOCKSVIEW
		1376	&& (op->face && !faces [op->face].visibility))
1505	{	1377	{
1506	for (last = top; last != floor; last = last->below)	1378	for (last = top; last != floor; last = last->below)
1507	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1379	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1508	break;	1380	break;
		1381
1509	/* Check to see if we found the object that blocks view,	1382	/* Check to see if we found the object that blocks view,
1510	* and make sure we have a below pointer for it so that	1383	* and make sure we have a below pointer for it so that
1511	* we can get inserted below this one, which requires we	1384	* we can get inserted below this one, which requires we
1512	* set top to the object below us.	1385	* set top to the object below us.
1513	*/	1386	*/
…		…
1515	top = last->below;	1388	top = last->below;
1516	}	1389	}
1517	} /* If objects on this space */	1390	} /* If objects on this space */
1518		1391
1519	if (flag & INS_MAP_LOAD)	1392	if (flag & INS_MAP_LOAD)
1520	top = GET_MAP_TOP (op->map, op->x, op->y);	1393	top = ms.top;
1521		1394
1522	if (flag & INS_ABOVE_FLOOR_ONLY)	1395	if (flag & INS_ABOVE_FLOOR_ONLY)
1523	top = floor;	1396	top = floor;
1524		1397
1525	/* Top is the object that our object (op) is going to get inserted above.	1398	/* Top is the object that our object (op) is going to get inserted above.
1526	*/	1399	*/
1527		1400
1528	/* First object on this space */	1401	/* First object on this space */
1529	if (!top)	1402	if (!top)
1530	{	1403	{
1531	op->above = GET_MAP_OB (op->map, op->x, op->y);	1404	op->above = ms.bot;
1532		1405
1533	if (op->above)	1406	if (op->above)
1534	op->above->below = op;	1407	op->above->below = op;
1535		1408
1536	op->below = NULL;	1409	op->below = 0;
1537	SET_MAP_OB (op->map, op->x, op->y, op);	1410	ms.bot = op;
1538	}	1411	}
1539	else	1412	else
1540	{ /* get inserted into the stack above top */	1413	{ /* get inserted into the stack above top */
1541	op->above = top->above;	1414	op->above = top->above;
1542		1415
…		…
1545		1418
1546	op->below = top;	1419	op->below = top;
1547	top->above = op;	1420	top->above = op;
1548	}	1421	}
1549		1422
1550	if (op->above == NULL)	1423	if (!op->above)
1551	SET_MAP_TOP (op->map, op->x, op->y, op);	1424	ms.top = op;
1552	} /* else not INS_BELOW_ORIGINATOR */	1425	} /* else not INS_BELOW_ORIGINATOR */
1553		1426
1554	if (op->type == PLAYER)	1427	if (op->type == PLAYER)
		1428	{
1555	op->contr->do_los = 1;	1429	op->contr->do_los = 1;
		1430	++op->map->players;
		1431	op->map->touch ();
		1432	}
		1433
		1434	op->map->dirty = true;
1556		1435
1557	/* If we have a floor, we know the player, if any, will be above	1436	/* If we have a floor, we know the player, if any, will be above
1558	* it, so save a few ticks and start from there.	1437	* it, so save a few ticks and start from there.
1559	*/	1438	*/
1560	if (!(flag & INS_MAP_LOAD))	1439	if (!(flag & INS_MAP_LOAD))
1561	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1440	if (object *pl = ms.player ())
1562	if (tmp->type == PLAYER)	1441	if (pl->contr->ns)
1563	tmp->contr->socket.update_look = 1;	1442	pl->contr->ns->floorbox_update ();
1564		1443
1565	/* If this object glows, it may affect lighting conditions that are	1444	/* If this object glows, it may affect lighting conditions that are
1566	* visible to others on this map. But update_all_los is really	1445	* visible to others on this map. But update_all_los is really
1567	* an inefficient way to do this, as it means los for all players	1446	* an inefficient way to do this, as it means los for all players
1568	* on the map will get recalculated. The players could very well	1447	* on the map will get recalculated. The players could very well
1569	* be far away from this change and not affected in any way -	1448	* be far away from this change and not affected in any way -
1570	* this should get redone to only look for players within range,	1449	* this should get redone to only look for players within range,
1571	* or just updating the P_NEED_UPDATE for spaces within this area	1450	* or just updating the P_UPTODATE for spaces within this area
1572	* of effect may be sufficient.	1451	* of effect may be sufficient.
1573	*/	1452	*/
1574	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1453	if (op->map->darkness && (op->glow_radius != 0))
1575	update_all_los (op->map, op->x, op->y);	1454	update_all_los (op->map, op->x, op->y);
1576		1455
1577	/* updates flags (blocked, alive, no magic, etc) for this map space */	1456	/* updates flags (blocked, alive, no magic, etc) for this map space */
1578	update_object (op, UP_OBJ_INSERT);	1457	update_object (op, UP_OBJ_INSERT);
1579		1458
		1459	INVOKE_OBJECT (INSERT, op);
		1460
1580	/* Don't know if moving this to the end will break anything. However,	1461	/* Don't know if moving this to the end will break anything. However,
1581	* we want to have update_look set above before calling this.	1462	* we want to have floorbox_update called before calling this.
1582	*	1463	*
1583	* check_move_on() must be after this because code called from	1464	* check_move_on() must be after this because code called from
1584	* check_move_on() depends on correct map flags (so functions like	1465	* check_move_on() depends on correct map flags (so functions like
1585	* blocked() and wall() work properly), and these flags are updated by	1466	* blocked() and wall() work properly), and these flags are updated by
1586	* update_object().	1467	* update_object().
…		…
1588		1469
1589	/* if this is not the head or flag has been passed, don't check walk on status */	1470	/* if this is not the head or flag has been passed, don't check walk on status */
1590	if (!(flag & INS_NO_WALK_ON) && !op->head)	1471	if (!(flag & INS_NO_WALK_ON) && !op->head)
1591	{	1472	{
1592	if (check_move_on (op, originator))	1473	if (check_move_on (op, originator))
1593	return NULL;	1474	return 0;
1594		1475
1595	/* If we are a multi part object, lets work our way through the check	1476	/* If we are a multi part object, lets work our way through the check
1596	* walk on's.	1477	* walk on's.
1597	*/	1478	*/
1598	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1479	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1599	if (check_move_on (tmp, originator))	1480	if (check_move_on (tmp, originator))
1600	return NULL;	1481	return 0;
1601	}	1482	}
1602		1483
1603	return op;	1484	return op;
1604	}	1485	}
1605		1486
1606	/* this function inserts an object in the map, but if it	1487	/* this function inserts an object in the map, but if it
1607	* finds an object of its own type, it'll remove that one first.	1488	* finds an object of its own type, it'll remove that one first.
1608	* op is the object to insert it under: supplies x and the map.	1489	* op is the object to insert it under: supplies x and the map.
1609	*/	1490	*/
1610	void	1491	void
1611	replace_insert_ob_in_map (const char *arch_string, object *op)	1492	replace_insert_ob_in_map (const char *arch_string, object *op)
1612	{	1493	{
1613	object *	1494	object *tmp, *tmp1;
1614	tmp;
1615	object *
1616	tmp1;
1617		1495
1618	/* first search for itself and remove any old instances */	1496	/* first search for itself and remove any old instances */
1619		1497
1620	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1498	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1621	{
1622	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1499	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1623	{	1500	tmp->destroy ();
1624	remove_ob (tmp);
1625	free_object (tmp);
1626	}
1627	}
1628		1501
1629	tmp1 = arch_to_object (archetype::find (arch_string));	1502	tmp1 = arch_to_object (archetype::find (arch_string));
1630		1503
1631	tmp1->x = op->x;	1504	tmp1->x = op->x;
1632	tmp1->y = op->y;	1505	tmp1->y = op->y;
1633	insert_ob_in_map (tmp1, op->map, op, 0);	1506	insert_ob_in_map (tmp1, op->map, op, 0);
		1507	}
		1508
		1509	object *
		1510	object::insert_at (object *where, object *originator, int flags)
		1511	{
		1512	return where->map->insert (this, where->x, where->y, originator, flags);
1634	}	1513	}
1635		1514
1636	/*	1515	/*
1637	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1516	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1638	* is returned contains nr objects, and the remaining parts contains	1517	* is returned contains nr objects, and the remaining parts contains
1639	* the rest (or is removed and freed if that number is 0).	1518	* the rest (or is removed and freed if that number is 0).
1640	* On failure, NULL is returned, and the reason put into the	1519	* On failure, NULL is returned, and the reason put into the
1641	* global static errmsg array.	1520	* global static errmsg array.
1642	*/	1521	*/
1643
1644	object *	1522	object *
1645	get_split_ob (object *orig_ob, uint32 nr)	1523	get_split_ob (object *orig_ob, uint32 nr)
1646	{	1524	{
1647	object *	1525	object *newob;
1648	newob;
1649	int
1650	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1526	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1651		1527
1652	if (orig_ob->nrof < nr)	1528	if (orig_ob->nrof < nr)
1653	{	1529	{
1654	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1530	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1655	return NULL;	1531	return NULL;
1656	}	1532	}
1657		1533
1658	newob = object_create_clone (orig_ob);	1534	newob = object_create_clone (orig_ob);
1659		1535
1660	if ((orig_ob->nrof -= nr) < 1)	1536	if ((orig_ob->nrof -= nr) < 1)
1661	{	1537	orig_ob->destroy (1);
1662	if (!is_removed)
1663	remove_ob (orig_ob);
1664	free_object2 (orig_ob, 1);
1665	}
1666	else if (!is_removed)	1538	else if (!is_removed)
1667	{	1539	{
1668	if (orig_ob->env != NULL)	1540	if (orig_ob->env != NULL)
1669	sub_weight (orig_ob->env, orig_ob->weight * nr);	1541	sub_weight (orig_ob->env, orig_ob->weight * nr);
1670	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1542	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1685	* the amount of an object. If the amount reaches 0, the object	1557	* the amount of an object. If the amount reaches 0, the object
1686	* is subsequently removed and freed.	1558	* is subsequently removed and freed.
1687	*	1559	*
1688	* Return value: 'op' if something is left, NULL if the amount reached 0	1560	* Return value: 'op' if something is left, NULL if the amount reached 0
1689	*/	1561	*/
1690
1691	object *	1562	object *
1692	decrease_ob_nr (object *op, uint32 i)	1563	decrease_ob_nr (object *op, uint32 i)
1693	{	1564	{
1694	object *tmp;	1565	object *tmp;
1695	player *pl;
1696		1566
1697	if (i == 0) /* objects with op->nrof require this check */	1567	if (i == 0) /* objects with op->nrof require this check */
1698	return op;	1568	return op;
1699		1569
1700	if (i > op->nrof)	1570	if (i > op->nrof)
1701	i = op->nrof;	1571	i = op->nrof;
1702		1572
1703	if (QUERY_FLAG (op, FLAG_REMOVED))	1573	if (QUERY_FLAG (op, FLAG_REMOVED))
1704	op->nrof -= i;	1574	op->nrof -= i;
1705	else if (op->env != NULL)	1575	else if (op->env)
1706	{	1576	{
1707	/* is this object in the players inventory, or sub container	1577	/* is this object in the players inventory, or sub container
1708	* therein?	1578	* therein?
1709	*/	1579	*/
1710	tmp = is_player_inv (op->env);	1580	tmp = op->in_player ();
1711	/* nope. Is this a container the player has opened?	1581	/* nope. Is this a container the player has opened?
1712	* If so, set tmp to that player.	1582	* If so, set tmp to that player.
1713	* IMO, searching through all the players will mostly	1583	* IMO, searching through all the players will mostly
1714	* likely be quicker than following op->env to the map,	1584	* likely be quicker than following op->env to the map,
1715	* and then searching the map for a player.	1585	* and then searching the map for a player.
1716	*/	1586	*/
1717	if (!tmp)	1587	if (!tmp)
1718	{	1588	for_all_players (pl)
1719	for (pl = first_player; pl; pl = pl->next)
1720	if (pl->ob->container == op->env)	1589	if (pl->ob->container == op->env)
		1590	{
		1591	tmp = pl->ob;
1721	break;	1592	break;
1722	if (pl)
1723	tmp = pl->ob;
1724	else
1725	tmp = NULL;
1726	}	1593	}
1727		1594
1728	if (i < op->nrof)	1595	if (i < op->nrof)
1729	{	1596	{
1730	sub_weight (op->env, op->weight * i);	1597	sub_weight (op->env, op->weight * i);
1731	op->nrof -= i;	1598	op->nrof -= i;
1732	if (tmp)	1599	if (tmp)
1733	{
1734	esrv_send_item (tmp, op);	1600	esrv_send_item (tmp, op);
1735	}
1736	}	1601	}
1737	else	1602	else
1738	{	1603	{
1739	remove_ob (op);	1604	op->remove ();
1740	op->nrof = 0;	1605	op->nrof = 0;
1741	if (tmp)	1606	if (tmp)
1742	{
1743	esrv_del_item (tmp->contr, op->count);	1607	esrv_del_item (tmp->contr, op->count);
1744	}
1745	}	1608	}
1746	}	1609	}
1747	else	1610	else
1748	{	1611	{
1749	object *above = op->above;	1612	object *above = op->above;
1750		1613
1751	if (i < op->nrof)	1614	if (i < op->nrof)
1752	op->nrof -= i;	1615	op->nrof -= i;
1753	else	1616	else
1754	{	1617	{
1755	remove_ob (op);	1618	op->remove ();
1756	op->nrof = 0;	1619	op->nrof = 0;
1757	}	1620	}
1758		1621
1759	/* Since we just removed op, op->above is null */	1622	/* Since we just removed op, op->above is null */
1760	for (tmp = above; tmp != NULL; tmp = tmp->above)	1623	for (tmp = above; tmp; tmp = tmp->above)
1761	if (tmp->type == PLAYER)	1624	if (tmp->type == PLAYER)
1762	{	1625	{
1763	if (op->nrof)	1626	if (op->nrof)
1764	esrv_send_item (tmp, op);	1627	esrv_send_item (tmp, op);
1765	else	1628	else
…		…
1769		1632
1770	if (op->nrof)	1633	if (op->nrof)
1771	return op;	1634	return op;
1772	else	1635	else
1773	{	1636	{
1774	free_object (op);	1637	op->destroy ();
1775	return NULL;	1638	return 0;
1776	}	1639	}
1777	}	1640	}
1778		1641
1779	/*	1642	/*
1780	* add_weight(object, weight) adds the specified weight to an object,	1643	* add_weight(object, weight) adds the specified weight to an object,
1781	* and also updates how much the environment(s) is/are carrying.	1644	* and also updates how much the environment(s) is/are carrying.
1782	*/	1645	*/
1783
1784	void	1646	void
1785	add_weight (object *op, signed long weight)	1647	add_weight (object *op, signed long weight)
1786	{	1648	{
1787	while (op != NULL)	1649	while (op != NULL)
1788	{	1650	{
…		…
1792	op->carrying += weight;	1654	op->carrying += weight;
1793	op = op->env;	1655	op = op->env;
1794	}	1656	}
1795	}	1657	}
1796		1658
		1659	object *
		1660	insert_ob_in_ob (object *op, object *where)
		1661	{
		1662	if (!where)
		1663	{
		1664	char *dump = dump_object (op);
		1665	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1666	free (dump);
		1667	return op;
		1668	}
		1669
		1670	if (where->head)
		1671	{
		1672	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1673	where = where->head;
		1674	}
		1675
		1676	return where->insert (op);
		1677	}
		1678
1797	/*	1679	/*
1798	* insert_ob_in_ob(op,environment):	1680	* env->insert (op)
1799	* This function inserts the object op in the linked list	1681	* This function inserts the object op in the linked list
1800	* inside the object environment.	1682	* inside the object environment.
1801	*	1683	*
1802	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1803	* the inventory at the last position or next to other objects of the same
1804	* type.
1805	* Frank: Now sorted by type, archetype and magic!
1806	*
1807	* The function returns now pointer to inserted item, and return value can	1684	* The function returns now pointer to inserted item, and return value can
1808	* be != op, if items are merged. -Tero	1685	* be != op, if items are merged. -Tero
1809	*/	1686	*/
1810
1811	object *	1687	object *
1812	insert_ob_in_ob (object *op, object *where)	1688	object::insert (object *op)
1813	{	1689	{
1814	object *	1690	object *tmp, *otmp;
1815	tmp, *
1816	otmp;
1817		1691
1818	if (!QUERY_FLAG (op, FLAG_REMOVED))	1692	if (!QUERY_FLAG (op, FLAG_REMOVED))
1819	{	1693	op->remove ();
1820	dump_object (op);
1821	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1822	return op;
1823	}
1824
1825	if (where == NULL)
1826	{
1827	dump_object (op);
1828	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1829	return op;
1830	}
1831
1832	if (where->head)
1833	{
1834	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1835	where = where->head;
1836	}
1837		1694
1838	if (op->more)	1695	if (op->more)
1839	{	1696	{
1840	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1697	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1841	return op;	1698	return op;
…		…
1843		1700
1844	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1701	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1845	CLEAR_FLAG (op, FLAG_REMOVED);	1702	CLEAR_FLAG (op, FLAG_REMOVED);
1846	if (op->nrof)	1703	if (op->nrof)
1847	{	1704	{
1848	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1705	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1849	if (CAN_MERGE (tmp, op))	1706	if (object::can_merge (tmp, op))
1850	{	1707	{
1851	/* return the original object and remove inserted object	1708	/* return the original object and remove inserted object
1852	(client needs the original object) */	1709	(client needs the original object) */
1853	tmp->nrof += op->nrof;	1710	tmp->nrof += op->nrof;
1854	/* Weight handling gets pretty funky. Since we are adding to	1711	/* Weight handling gets pretty funky. Since we are adding to
1855	* tmp->nrof, we need to increase the weight.	1712	* tmp->nrof, we need to increase the weight.
1856	*/	1713	*/
1857	add_weight (where, op->weight * op->nrof);	1714	add_weight (this, op->weight * op->nrof);
1858	SET_FLAG (op, FLAG_REMOVED);	1715	SET_FLAG (op, FLAG_REMOVED);
1859	free_object (op); /* free the inserted object */	1716	op->destroy (); /* free the inserted object */
1860	op = tmp;	1717	op = tmp;
1861	remove_ob (op); /* and fix old object's links */	1718	op->remove (); /* and fix old object's links */
1862	CLEAR_FLAG (op, FLAG_REMOVED);	1719	CLEAR_FLAG (op, FLAG_REMOVED);
1863	break;	1720	break;
1864	}	1721	}
1865		1722
1866	/* I assume combined objects have no inventory	1723	/* I assume combined objects have no inventory
1867	* We add the weight - this object could have just been removed	1724	* We add the weight - this object could have just been removed
1868	* (if it was possible to merge). calling remove_ob will subtract	1725	* (if it was possible to merge). calling remove_ob will subtract
1869	* the weight, so we need to add it in again, since we actually do	1726	* the weight, so we need to add it in again, since we actually do
1870	* the linking below	1727	* the linking below
1871	*/	1728	*/
1872	add_weight (where, op->weight * op->nrof);	1729	add_weight (this, op->weight * op->nrof);
1873	}	1730	}
1874	else	1731	else
1875	add_weight (where, (op->weight + op->carrying));	1732	add_weight (this, (op->weight + op->carrying));
1876		1733
1877	otmp = is_player_inv (where);	1734	otmp = this->in_player ();
1878	if (otmp && otmp->contr != NULL)	1735	if (otmp && otmp->contr)
1879	{
1880	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1736	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1881	fix_player (otmp);	1737	otmp->update_stats ();
1882	}
1883		1738
1884	op->map = NULL;	1739	op->map = 0;
1885	op->env = where;	1740	op->env = this;
1886	op->above = NULL;	1741	op->above = 0;
1887	op->below = NULL;	1742	op->below = 0;
1888	op->x = 0, op->y = 0;	1743	op->x = 0, op->y = 0;
1889		1744
1890	/* reset the light list and los of the players on the map */	1745	/* reset the light list and los of the players on the map */
1891	if ((op->glow_radius != 0) && where->map)	1746	if ((op->glow_radius != 0) && map)
1892	{	1747	{
1893	#ifdef DEBUG_LIGHTS	1748	#ifdef DEBUG_LIGHTS
1894	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1749	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1895	#endif /* DEBUG_LIGHTS */	1750	#endif /* DEBUG_LIGHTS */
1896	if (MAP_DARKNESS (where->map))	1751	if (map->darkness)
1897	update_all_los (where->map, where->x, where->y);	1752	update_all_los (map, x, y);
1898	}	1753	}
1899		1754
1900	/* Client has no idea of ordering so lets not bother ordering it here.	1755	/* Client has no idea of ordering so lets not bother ordering it here.
1901	* It sure simplifies this function...	1756	* It sure simplifies this function...
1902	*/	1757	*/
1903	if (where->inv == NULL)	1758	if (!inv)
1904	where->inv = op;	1759	inv = op;
1905	else	1760	else
1906	{	1761	{
1907	op->below = where->inv;	1762	op->below = inv;
1908	op->below->above = op;	1763	op->below->above = op;
1909	where->inv = op;	1764	inv = op;
1910	}	1765	}
		1766
		1767	INVOKE_OBJECT (INSERT, this);
		1768
1911	return op;	1769	return op;
1912	}	1770	}
1913		1771
1914	/*	1772	/*
1915	* Checks if any objects has a move_type that matches objects	1773	* Checks if any objects has a move_type that matches objects
…		…
1929	*	1787	*
1930	* MSW 2001-07-08: Check all objects on space, not just those below	1788	* MSW 2001-07-08: Check all objects on space, not just those below
1931	* object being inserted. insert_ob_in_map may not put new objects	1789	* object being inserted. insert_ob_in_map may not put new objects
1932	* on top.	1790	* on top.
1933	*/	1791	*/
1934
1935	int	1792	int
1936	check_move_on (object *op, object *originator)	1793	check_move_on (object *op, object *originator)
1937	{	1794	{
1938	object *	1795	object *tmp;
1939	tmp;	1796	maptile *m = op->map;
1940	tag_t
1941	tag;
1942	mapstruct *
1943	m = op->map;
1944	int
1945	x = op->x, y = op->y;	1797	int x = op->x, y = op->y;
1946		1798
1947	MoveType	1799	MoveType move_on, move_slow, move_block;
1948	move_on,
1949	move_slow,
1950	move_block;
1951		1800
1952	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1801	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1953	return 0;	1802	return 0;
1954
1955	tag = op->count;
1956		1803
1957	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1804	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1958	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1805	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1959	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1806	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1960		1807
…		…
1976		1823
1977	/* The objects have to be checked from top to bottom.	1824	/* The objects have to be checked from top to bottom.
1978	* Hence, we first go to the top:	1825	* Hence, we first go to the top:
1979	*/	1826	*/
1980		1827
1981	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1828	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1982	{	1829	{
1983	/* Trim the search when we find the first other spell effect	1830	/* Trim the search when we find the first other spell effect
1984	* this helps performance so that if a space has 50 spell objects,	1831	* this helps performance so that if a space has 50 spell objects,
1985	* we don't need to check all of them.	1832	* we don't need to check all of them.
1986	*/	1833	*/
…		…
2004	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1851	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2005	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1852	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2006	{	1853	{
2007		1854
2008	float	1855	float
2009	diff = tmp->move_slow_penalty * FABS (op->speed);	1856	diff = tmp->move_slow_penalty * fabs (op->speed);
2010		1857
2011	if (op->type == PLAYER)	1858	if (op->type == PLAYER)
2012	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1859	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2013	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1860	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2014	diff /= 4.0;	1861	diff /= 4.0;
…		…
2021	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1868	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2022	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1869	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2023	{	1870	{
2024	move_apply (tmp, op, originator);	1871	move_apply (tmp, op, originator);
2025		1872
2026	if (was_destroyed (op, tag))	1873	if (op->destroyed ())
2027	return 1;	1874	return 1;
2028		1875
2029	/* what the person/creature stepped onto has moved the object	1876	/* what the person/creature stepped onto has moved the object
2030	* someplace new. Don't process any further - if we did,	1877	* someplace new. Don't process any further - if we did,
2031	* have a feeling strange problems would result.	1878	* have a feeling strange problems would result.
…		…
2041	/*	1888	/*
2042	* present_arch(arch, map, x, y) searches for any objects with	1889	* present_arch(arch, map, x, y) searches for any objects with
2043	* a matching archetype at the given map and coordinates.	1890	* a matching archetype at the given map and coordinates.
2044	* The first matching object is returned, or NULL if none.	1891	* The first matching object is returned, or NULL if none.
2045	*/	1892	*/
2046
2047	object *	1893	object *
2048	present_arch (const archetype *at, mapstruct *m, int x, int y)	1894	present_arch (const archetype *at, maptile *m, int x, int y)
2049	{	1895	{
2050	object *
2051	tmp;
2052
2053	if (m == NULL || out_of_map (m, x, y))	1896	if (!m || out_of_map (m, x, y))
2054	{	1897	{
2055	LOG (llevError, "Present_arch called outside map.\n");	1898	LOG (llevError, "Present_arch called outside map.\n");
2056	return NULL;	1899	return NULL;
2057	}	1900	}
2058	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1901
		1902	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
2059	if (tmp->arch == at)	1903	if (tmp->arch == at)
2060	return tmp;	1904	return tmp;
		1905
2061	return NULL;	1906	return NULL;
2062	}	1907	}
2063		1908
2064	/*	1909	/*
2065	* present(type, map, x, y) searches for any objects with	1910	* present(type, map, x, y) searches for any objects with
2066	* a matching type variable at the given map and coordinates.	1911	* a matching type variable at the given map and coordinates.
2067	* The first matching object is returned, or NULL if none.	1912	* The first matching object is returned, or NULL if none.
2068	*/	1913	*/
2069
2070	object *	1914	object *
2071	present (unsigned char type, mapstruct *m, int x, int y)	1915	present (unsigned char type, maptile *m, int x, int y)
2072	{	1916	{
2073	object *
2074	tmp;
2075
2076	if (out_of_map (m, x, y))	1917	if (out_of_map (m, x, y))
2077	{	1918	{
2078	LOG (llevError, "Present called outside map.\n");	1919	LOG (llevError, "Present called outside map.\n");
2079	return NULL;	1920	return NULL;
2080	}	1921	}
2081	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1922
		1923	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
2082	if (tmp->type == type)	1924	if (tmp->type == type)
2083	return tmp;	1925	return tmp;
		1926
2084	return NULL;	1927	return NULL;
2085	}	1928	}
2086		1929
2087	/*	1930	/*
2088	* present_in_ob(type, object) searches for any objects with	1931	* present_in_ob(type, object) searches for any objects with
2089	* a matching type variable in the inventory of the given object.	1932	* a matching type variable in the inventory of the given object.
2090	* The first matching object is returned, or NULL if none.	1933	* The first matching object is returned, or NULL if none.
2091	*/	1934	*/
2092
2093	object *	1935	object *
2094	present_in_ob (unsigned char type, const object *op)	1936	present_in_ob (unsigned char type, const object *op)
2095	{	1937	{
2096	object *
2097	tmp;
2098
2099	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1938	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2100	if (tmp->type == type)	1939	if (tmp->type == type)
2101	return tmp;	1940	return tmp;
		1941
2102	return NULL;	1942	return NULL;
2103	}	1943	}
2104		1944
2105	/*	1945	/*
2106	* present_in_ob (type, str, object) searches for any objects with	1946	* present_in_ob (type, str, object) searches for any objects with
…		…
2114	* str is the string to match against. Note that we match against	1954	* str is the string to match against. Note that we match against
2115	* the object name, not the archetype name. this is so that the	1955	* the object name, not the archetype name. this is so that the
2116	* spell code can use one object type (force), but change it's name	1956	* spell code can use one object type (force), but change it's name
2117	* to be unique.	1957	* to be unique.
2118	*/	1958	*/
2119
2120	object *	1959	object *
2121	present_in_ob_by_name (int type, const char *str, const object *op)	1960	present_in_ob_by_name (int type, const char *str, const object *op)
2122	{	1961	{
2123	object *
2124	tmp;
2125
2126	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1962	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2127	{
2128	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1963	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2129	return tmp;	1964	return tmp;
2130	}	1965
2131	return NULL;	1966	return 0;
2132	}	1967	}
2133		1968
2134	/*	1969	/*
2135	* present_arch_in_ob(archetype, object) searches for any objects with	1970	* present_arch_in_ob(archetype, object) searches for any objects with
2136	* a matching archetype in the inventory of the given object.	1971	* a matching archetype in the inventory of the given object.
2137	* The first matching object is returned, or NULL if none.	1972	* The first matching object is returned, or NULL if none.
2138	*/	1973	*/
2139
2140	object *	1974	object *
2141	present_arch_in_ob (const archetype *at, const object *op)	1975	present_arch_in_ob (const archetype *at, const object *op)
2142	{	1976	{
2143	object *
2144	tmp;
2145
2146	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1977	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2147	if (tmp->arch == at)	1978	if (tmp->arch == at)
2148	return tmp;	1979	return tmp;
		1980
2149	return NULL;	1981	return NULL;
2150	}	1982	}
2151		1983
2152	/*	1984	/*
2153	* activate recursively a flag on an object inventory	1985	* activate recursively a flag on an object inventory
2154	*/	1986	*/
2155	void	1987	void
2156	flag_inv (object *op, int flag)	1988	flag_inv (object *op, int flag)
2157	{	1989	{
2158	object *
2159	tmp;
2160
2161	if (op->inv)	1990	if (op->inv)
2162	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1991	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2163	{	1992	{
2164	SET_FLAG (tmp, flag);	1993	SET_FLAG (tmp, flag);
2165	flag_inv (tmp, flag);	1994	flag_inv (tmp, flag);
2166	}	1995	}
2167	} /*	1996	}
		1997
		1998	/*
2168	* desactivate recursively a flag on an object inventory	1999	* deactivate recursively a flag on an object inventory
2169	*/	2000	*/
2170	void	2001	void
2171	unflag_inv (object *op, int flag)	2002	unflag_inv (object *op, int flag)
2172	{	2003	{
2173	object *
2174	tmp;
2175
2176	if (op->inv)	2004	if (op->inv)
2177	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	2005	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2178	{	2006	{
2179	CLEAR_FLAG (tmp, flag);	2007	CLEAR_FLAG (tmp, flag);
2180	unflag_inv (tmp, flag);	2008	unflag_inv (tmp, flag);
2181	}	2009	}
2182	}	2010	}
…		…
2185	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	2013	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2186	* all it's inventory (recursively).	2014	* all it's inventory (recursively).
2187	* If checksums are used, a player will get set_cheat called for	2015	* If checksums are used, a player will get set_cheat called for
2188	* him/her-self and all object carried by a call to this function.	2016	* him/her-self and all object carried by a call to this function.
2189	*/	2017	*/
2190
2191	void	2018	void
2192	set_cheat (object *op)	2019	set_cheat (object *op)
2193	{	2020	{
2194	SET_FLAG (op, FLAG_WAS_WIZ);	2021	SET_FLAG (op, FLAG_WAS_WIZ);
2195	flag_inv (op, FLAG_WAS_WIZ);	2022	flag_inv (op, FLAG_WAS_WIZ);
…		…
2214	* because arch_blocked (now ob_blocked) needs to know the movement type	2041	* because arch_blocked (now ob_blocked) needs to know the movement type
2215	* to know if the space in question will block the object. We can't use	2042	* to know if the space in question will block the object. We can't use
2216	* the archetype because that isn't correct if the monster has been	2043	* the archetype because that isn't correct if the monster has been
2217	* customized, changed states, etc.	2044	* customized, changed states, etc.
2218	*/	2045	*/
2219
2220	int	2046	int
2221	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2047	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2222	{	2048	{
2223	int
2224	i,
2225	index = 0, flag;	2049	int index = 0, flag;
2226	static int
2227	altern[SIZEOFFREE];	2050	int altern[SIZEOFFREE];
2228		2051
2229	for (i = start; i < stop; i++)	2052	for (int i = start; i < stop; i++)
2230	{	2053	{
2231	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2054	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2232	if (!flag)	2055	if (!flag)
2233	altern[index++] = i;	2056	altern [index++] = i;
2234		2057
2235	/* Basically, if we find a wall on a space, we cut down the search size.	2058	/* Basically, if we find a wall on a space, we cut down the search size.
2236	* In this way, we won't return spaces that are on another side of a wall.	2059	* In this way, we won't return spaces that are on another side of a wall.
2237	* This mostly work, but it cuts down the search size in all directions -	2060	* This mostly work, but it cuts down the search size in all directions -
2238	* if the space being examined only has a wall to the north and empty	2061	* if the space being examined only has a wall to the north and empty
2239	* spaces in all the other directions, this will reduce the search space	2062	* spaces in all the other directions, this will reduce the search space
2240	* to only the spaces immediately surrounding the target area, and	2063	* to only the spaces immediately surrounding the target area, and
2241	* won't look 2 spaces south of the target space.	2064	* won't look 2 spaces south of the target space.
2242	*/	2065	*/
2243	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2066	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2244	stop = maxfree[i];	2067	stop = maxfree[i];
2245	}	2068	}
		2069
2246	if (!index)	2070	if (!index)
2247	return -1;	2071	return -1;
		2072
2248	return altern[RANDOM () % index];	2073	return altern [rndm (index)];
2249	}	2074	}
2250		2075
2251	/*	2076	/*
2252	* find_first_free_spot(archetype, mapstruct, x, y) works like	2077	* find_first_free_spot(archetype, maptile, x, y) works like
2253	* find_free_spot(), but it will search max number of squares.	2078	* find_free_spot(), but it will search max number of squares.
2254	* But it will return the first available spot, not a random choice.	2079	* But it will return the first available spot, not a random choice.
2255	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2080	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2256	*/	2081	*/
2257
2258	int	2082	int
2259	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2083	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2260	{	2084	{
2261	int
2262	i;
2263
2264	for (i = 0; i < SIZEOFFREE; i++)	2085	for (int i = 0; i < SIZEOFFREE; i++)
2265	{
2266	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2086	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2267	return i;	2087	return i;
2268	}	2088
2269	return -1;	2089	return -1;
2270	}	2090	}
2271		2091
2272	/*	2092	/*
2273	* The function permute(arr, begin, end) randomly reorders the array	2093	* The function permute(arr, begin, end) randomly reorders the array
2274	* arr[begin..end-1].	2094	* arr[begin..end-1].
		2095	* now uses a fisher-yates shuffle, old permute was broken
2275	*/	2096	*/
2276	static void	2097	static void
2277	permute (int *arr, int begin, int end)	2098	permute (int *arr, int begin, int end)
2278	{	2099	{
2279	int	2100	arr += begin;
2280	i,
2281	j,
2282	tmp,
2283	len;
2284
2285	len = end - begin;	2101	end -= begin;
2286	for (i = begin; i < end; i++)
2287	{
2288	j = begin + RANDOM () % len;
2289		2102
2290	tmp = arr[i];	2103	while (--end)
2291	arr[i] = arr[j];	2104	swap (arr [end], arr [rndm (end + 1)]);
2292	arr[j] = tmp;
2293	}
2294	}	2105	}
2295		2106
2296	/* new function to make monster searching more efficient, and effective!	2107	/* new function to make monster searching more efficient, and effective!
2297	* This basically returns a randomized array (in the passed pointer) of	2108	* This basically returns a randomized array (in the passed pointer) of
2298	* the spaces to find monsters. In this way, it won't always look for	2109	* the spaces to find monsters. In this way, it won't always look for
…		…
2301	* the 3x3 area will be searched, just not in a predictable order.	2112	* the 3x3 area will be searched, just not in a predictable order.
2302	*/	2113	*/
2303	void	2114	void
2304	get_search_arr (int *search_arr)	2115	get_search_arr (int *search_arr)
2305	{	2116	{
2306	int	2117	int i;
2307	i;
2308		2118
2309	for (i = 0; i < SIZEOFFREE; i++)	2119	for (i = 0; i < SIZEOFFREE; i++)
2310	{
2311	search_arr[i] = i;	2120	search_arr[i] = i;
2312	}
2313		2121
2314	permute (search_arr, 1, SIZEOFFREE1 + 1);	2122	permute (search_arr, 1, SIZEOFFREE1 + 1);
2315	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2123	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2316	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2124	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2317	}	2125	}
…		…
2326	* Perhaps incorrectly, but I'm making the assumption that exclude	2134	* Perhaps incorrectly, but I'm making the assumption that exclude
2327	* is actually want is going to try and move there. We need this info	2135	* is actually want is going to try and move there. We need this info
2328	* because we have to know what movement the thing looking to move	2136	* because we have to know what movement the thing looking to move
2329	* there is capable of.	2137	* there is capable of.
2330	*/	2138	*/
2331
2332	int	2139	int
2333	find_dir (mapstruct *m, int x, int y, object *exclude)	2140	find_dir (maptile *m, int x, int y, object *exclude)
2334	{	2141	{
2335	int
2336	i,
2337	max = SIZEOFFREE, mflags;	2142	int i, max = SIZEOFFREE, mflags;
2338		2143
2339	sint16 nx, ny;	2144	sint16 nx, ny;
2340	object *	2145	object *tmp;
2341	tmp;	2146	maptile *mp;
2342	mapstruct *
2343	mp;
2344		2147
2345	MoveType blocked, move_type;	2148	MoveType blocked, move_type;
2346		2149
2347	if (exclude && exclude->head)	2150	if (exclude && exclude->head)
2348	{	2151	{
…		…
2360	mp = m;	2163	mp = m;
2361	nx = x + freearr_x[i];	2164	nx = x + freearr_x[i];
2362	ny = y + freearr_y[i];	2165	ny = y + freearr_y[i];
2363		2166
2364	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2167	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2168
2365	if (mflags & P_OUT_OF_MAP)	2169	if (mflags & P_OUT_OF_MAP)
2366	{
2367	max = maxfree[i];	2170	max = maxfree[i];
2368	}
2369	else	2171	else
2370	{	2172	{
2371	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2173	mapspace &ms = mp->at (nx, ny);
		2174
		2175	blocked = ms.move_block;
2372		2176
2373	if ((move_type & blocked) == move_type)	2177	if ((move_type & blocked) == move_type)
2374	{
2375	max = maxfree[i];	2178	max = maxfree[i];
2376	}
2377	else if (mflags & P_IS_ALIVE)	2179	else if (mflags & P_IS_ALIVE)
2378	{	2180	{
2379	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2181	for (tmp = ms.bot; tmp; tmp = tmp->above)
2380	{	2182	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2381	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2183	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2382	{
2383	break;	2184	break;
2384	}	2185
2385	}
2386	if (tmp)	2186	if (tmp)
2387	{
2388	return freedir[i];	2187	return freedir[i];
2389	}
2390	}	2188	}
2391	}	2189	}
2392	}	2190	}
		2191
2393	return 0;	2192	return 0;
2394	}	2193	}
2395		2194
2396	/*	2195	/*
2397	* distance(object 1, object 2) will return the square of the	2196	* distance(object 1, object 2) will return the square of the
2398	* distance between the two given objects.	2197	* distance between the two given objects.
2399	*/	2198	*/
2400
2401	int	2199	int
2402	distance (const object *ob1, const object *ob2)	2200	distance (const object *ob1, const object *ob2)
2403	{	2201	{
2404	int
2405	i;
2406
2407	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2202	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2408	return i;
2409	}	2203	}
2410		2204
2411	/*	2205	/*
2412	* find_dir_2(delta-x,delta-y) will return a direction in which	2206	* find_dir_2(delta-x,delta-y) will return a direction in which
2413	* an object which has subtracted the x and y coordinates of another	2207	* an object which has subtracted the x and y coordinates of another
2414	* object, needs to travel toward it.	2208	* object, needs to travel toward it.
2415	*/	2209	*/
2416
2417	int	2210	int
2418	find_dir_2 (int x, int y)	2211	find_dir_2 (int x, int y)
2419	{	2212	{
2420	int	2213	int q;
2421	q;
2422		2214
2423	if (y)	2215	if (y)
2424	q = x * 100 / y;	2216	q = x * 100 / y;
2425	else if (x)	2217	else if (x)
2426	q = -300 * x;	2218	q = -300 * x;
…		…
2451		2243
2452	return 3;	2244	return 3;
2453	}	2245	}
2454		2246
2455	/*	2247	/*
2456	* absdir(int): Returns a number between 1 and 8, which represent
2457	* the "absolute" direction of a number (it actually takes care of
2458	* "overflow" in previous calculations of a direction).
2459	*/
2460
2461	int
2462	absdir (int d)
2463	{
2464	while (d < 1)
2465	d += 8;
2466	while (d > 8)
2467	d -= 8;
2468	return d;
2469	}
2470
2471	/*
2472	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2248	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2473	* between two directions (which are expected to be absolute (see absdir())	2249	* between two directions (which are expected to be absolute (see absdir())
2474	*/	2250	*/
2475
2476	int	2251	int
2477	dirdiff (int dir1, int dir2)	2252	dirdiff (int dir1, int dir2)
2478	{	2253	{
2479	int	2254	int d;
2480	d;
2481		2255
2482	d = abs (dir1 - dir2);	2256	d = abs (dir1 - dir2);
2483	if (d > 4)	2257	if (d > 4)
2484	d = 8 - d;	2258	d = 8 - d;
		2259
2485	return d;	2260	return d;
2486	}	2261	}
2487		2262
2488	/* peterm:	2263	/* peterm:
2489	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2264	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2492	* This basically means that if direction is 15, then it could either go	2267	* This basically means that if direction is 15, then it could either go
2493	* direction 4, 14, or 16 to get back to where we are.	2268	* direction 4, 14, or 16 to get back to where we are.
2494	* Moved from spell_util.c to object.c with the other related direction	2269	* Moved from spell_util.c to object.c with the other related direction
2495	* functions.	2270	* functions.
2496	*/	2271	*/
2497
2498	int
2499	reduction_dir[SIZEOFFREE][3] = {	2272	int reduction_dir[SIZEOFFREE][3] = {
2500	{0, 0, 0}, /* 0 */	2273	{0, 0, 0}, /* 0 */
2501	{0, 0, 0}, /* 1 */	2274	{0, 0, 0}, /* 1 */
2502	{0, 0, 0}, /* 2 */	2275	{0, 0, 0}, /* 2 */
2503	{0, 0, 0}, /* 3 */	2276	{0, 0, 0}, /* 3 */
2504	{0, 0, 0}, /* 4 */	2277	{0, 0, 0}, /* 4 */
…		…
2552	* find a path to that monster that we found. If not,	2325	* find a path to that monster that we found. If not,
2553	* we don't bother going toward it. Returns 1 if we	2326	* we don't bother going toward it. Returns 1 if we
2554	* can see a direct way to get it	2327	* can see a direct way to get it
2555	* Modified to be map tile aware -.MSW	2328	* Modified to be map tile aware -.MSW
2556	*/	2329	*/
2557
2558
2559	int	2330	int
2560	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2331	can_see_monsterP (maptile *m, int x, int y, int dir)
2561	{	2332	{
2562	sint16 dx, dy;	2333	sint16 dx, dy;
2563	int
2564	mflags;	2334	int mflags;
2565		2335
2566	if (dir < 0)	2336	if (dir < 0)
2567	return 0; /* exit condition: invalid direction */	2337	return 0; /* exit condition: invalid direction */
2568		2338
2569	dx = x + freearr_x[dir];	2339	dx = x + freearr_x[dir];
…		…
2582	return 0;	2352	return 0;
2583		2353
2584	/* yes, can see. */	2354	/* yes, can see. */
2585	if (dir < 9)	2355	if (dir < 9)
2586	return 1;	2356	return 1;
		2357
2587	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2358	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2588	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2359	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2360	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2589	}	2361	}
2590
2591
2592		2362
2593	/*	2363	/*
2594	* can_pick(picker, item): finds out if an object is possible to be	2364	* can_pick(picker, item): finds out if an object is possible to be
2595	* picked up by the picker. Returnes 1 if it can be	2365	* picked up by the picker. Returnes 1 if it can be
2596	* picked up, otherwise 0.	2366	* picked up, otherwise 0.
…		…
2607	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2377	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2608	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2378	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2609	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2379	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2610	}	2380	}
2611		2381
2612
2613	/*	2382	/*
2614	* create clone from object to another	2383	* create clone from object to another
2615	*/	2384	*/
2616	object *	2385	object *
2617	object_create_clone (object *asrc)	2386	object_create_clone (object *asrc)
2618	{	2387	{
2619	object *
2620	dst = NULL, *tmp, *src, *part, *prev, *item;	2388	object *dst = 0, *tmp, *src, *part, *prev, *item;
2621		2389
2622	if (!asrc)	2390	if (!asrc)
2623	return NULL;	2391	return 0;
		2392
2624	src = asrc;	2393	src = asrc;
2625	if (src->head)	2394	if (src->head)
2626	src = src->head;	2395	src = src->head;
2627		2396
2628	prev = NULL;	2397	prev = 0;
2629	for (part = src; part; part = part->more)	2398	for (part = src; part; part = part->more)
2630	{	2399	{
2631	tmp = get_object ();	2400	tmp = part->clone ();
2632	copy_object (part, tmp);
2633	tmp->x -= src->x;	2401	tmp->x -= src->x;
2634	tmp->y -= src->y;	2402	tmp->y -= src->y;
		2403
2635	if (!part->head)	2404	if (!part->head)
2636	{	2405	{
2637	dst = tmp;	2406	dst = tmp;
2638	tmp->head = NULL;	2407	tmp->head = 0;
2639	}	2408	}
2640	else	2409	else
2641	{
2642	tmp->head = dst;	2410	tmp->head = dst;
2643	}	2411
2644	tmp->more = NULL;	2412	tmp->more = 0;
		2413
2645	if (prev)	2414	if (prev)
2646	prev->more = tmp;	2415	prev->more = tmp;
		2416
2647	prev = tmp;	2417	prev = tmp;
2648	}	2418	}
2649		2419
2650	/*** copy inventory ***/
2651	for (item = src->inv; item; item = item->below)	2420	for (item = src->inv; item; item = item->below)
2652	{
2653	(void) insert_ob_in_ob (object_create_clone (item), dst);	2421	insert_ob_in_ob (object_create_clone (item), dst);
2654	}
2655		2422
2656	return dst;	2423	return dst;
2657	}
2658
2659	/* return true if the object was destroyed, 0 otherwise */
2660	int
2661	was_destroyed (const object *op, tag_t old_tag)
2662	{
2663	/* checking for FLAG_FREED isn't necessary, but makes this function more
2664	* robust */
2665	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2666	}
2667
2668	/* GROS - Creates an object using a string representing its content. */
2669
2670	/* Basically, we save the content of the string to a temp file, then call */
2671
2672	/* load_object on it. I admit it is a highly inefficient way to make things, */
2673
2674	/* but it was simple to make and allows reusing the load_object function. */
2675
2676	/* Remember not to use load_object_str in a time-critical situation. */
2677
2678	/* Also remember that multiparts objects are not supported for now. */
2679
2680	object *
2681	load_object_str (const char *obstr)
2682	{
2683	object *
2684	op;
2685	char
2686	filename[MAX_BUF];
2687
2688	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2689
2690	FILE *
2691	tempfile = fopen (filename, "w");
2692
2693	if (tempfile == NULL)
2694	{
2695	LOG (llevError, "Error - Unable to access load object temp file\n");
2696	return NULL;
2697	}
2698
2699	fprintf (tempfile, obstr);
2700	fclose (tempfile);
2701
2702	op = get_object ();
2703
2704	object_thawer thawer (filename);
2705
2706	if (thawer)
2707	load_object (thawer, op, 0);
2708
2709	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2710	CLEAR_FLAG (op, FLAG_REMOVED);
2711
2712	return op;
2713	}	2424	}
2714		2425
2715	/* This returns the first object in who's inventory that	2426	/* This returns the first object in who's inventory that
2716	* has the same type and subtype match.	2427	* has the same type and subtype match.
2717	* returns NULL if no match.	2428	* returns NULL if no match.
2718	*/	2429	*/
2719	object *	2430	object *
2720	find_obj_by_type_subtype (const object *who, int type, int subtype)	2431	find_obj_by_type_subtype (const object *who, int type, int subtype)
2721	{	2432	{
2722	object *
2723	tmp;
2724
2725	for (tmp = who->inv; tmp; tmp = tmp->below)	2433	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2726	if (tmp->type == type && tmp->subtype == subtype)	2434	if (tmp->type == type && tmp->subtype == subtype)
2727	return tmp;	2435	return tmp;
2728		2436
2729	return NULL;	2437	return 0;
2730	}	2438	}
2731		2439
2732	/* If ob has a field named key, return the link from the list,	2440	/* If ob has a field named key, return the link from the list,
2733	* otherwise return NULL.	2441	* otherwise return NULL.
2734	*	2442	*
…		…
2736	* do the desired thing.	2444	* do the desired thing.
2737	*/	2445	*/
2738	key_value *	2446	key_value *
2739	get_ob_key_link (const object *ob, const char *key)	2447	get_ob_key_link (const object *ob, const char *key)
2740	{	2448	{
2741	key_value *
2742	link;
2743
2744	for (link = ob->key_values; link != NULL; link = link->next)	2449	for (key_value *link = ob->key_values; link; link = link->next)
2745	{
2746	if (link->key == key)	2450	if (link->key == key)
2747	{
2748	return link;	2451	return link;
2749	}
2750	}
2751		2452
2752	return NULL;	2453	return 0;
2753	}	2454	}
2754		2455
2755	/*	2456	/*
2756	* Returns the value of op has an extra_field for key, or NULL.	2457	* Returns the value of op has an extra_field for key, or NULL.
2757	*	2458	*
…		…
2782	if (link->key == canonical_key)	2483	if (link->key == canonical_key)
2783	return link->value;	2484	return link->value;
2784		2485
2785	return 0;	2486	return 0;
2786	}	2487	}
2787
2788		2488
2789	/*	2489	/*
2790	* Updates the canonical_key in op to value.	2490	* Updates the canonical_key in op to value.
2791	*	2491	*
2792	* canonical_key is a shared string (value doesn't have to be).	2492	* canonical_key is a shared string (value doesn't have to be).
…		…
2797	* Returns TRUE on success.	2497	* Returns TRUE on success.
2798	*/	2498	*/
2799	int	2499	int
2800	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2500	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2801	{	2501	{
2802	key_value *
2803	field = NULL, *last = NULL;	2502	key_value *field = NULL, *last = NULL;
2804		2503
2805	for (field = op->key_values; field != NULL; field = field->next)	2504	for (field = op->key_values; field != NULL; field = field->next)
2806	{	2505	{
2807	if (field->key != canonical_key)	2506	if (field->key != canonical_key)
2808	{	2507	{
…		…
2836	/* IF we get here, key doesn't exist */	2535	/* IF we get here, key doesn't exist */
2837		2536
2838	/* No field, we'll have to add it. */	2537	/* No field, we'll have to add it. */
2839		2538
2840	if (!add_key)	2539	if (!add_key)
2841	{
2842	return FALSE;	2540	return FALSE;
2843	}	2541
2844	/* There isn't any good reason to store a null	2542	/* There isn't any good reason to store a null
2845	* value in the key/value list. If the archetype has	2543	* value in the key/value list. If the archetype has
2846	* this key, then we should also have it, so shouldn't	2544	* this key, then we should also have it, so shouldn't
2847	* be here. If user wants to store empty strings,	2545	* be here. If user wants to store empty strings,
2848	* should pass in ""	2546	* should pass in ""
…		…
2897	}	2595	}
2898	else	2596	else
2899	item = item->env;	2597	item = item->env;
2900	}	2598	}
2901		2599
		2600
		2601	const char *
		2602	object::flag_desc (char *desc, int len) const
		2603	{
		2604	char *p = desc;
		2605	bool first = true;
		2606
		2607	*p = 0;
		2608
		2609	for (int i = 0; i < NUM_FLAGS; i++)
		2610	{
		2611	if (len <= 10) // magic constant!
		2612	{
		2613	snprintf (p, len, ",...");
		2614	break;
		2615	}
		2616
		2617	if (flag [i])
		2618	{
		2619	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2620	len -= cnt;
		2621	p += cnt;
		2622	first = false;
		2623	}
		2624	}
		2625
		2626	return desc;
		2627	}
		2628
2902	// return a suitable string describing an objetc in enough detail to find it	2629	// return a suitable string describing an object in enough detail to find it
2903	const char *	2630	const char *
2904	object::debug_desc (char *info) const	2631	object::debug_desc (char *info) const
2905	{	2632	{
		2633	char flagdesc[512];
2906	char info2[256 * 3];	2634	char info2[256 * 4];
2907	char *p = info;	2635	char *p = info;
2908		2636
2909	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2637	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2910	count,	2638	count, uuid.seq,
2911	&name,	2639	&name,
2912	title ? " " : "",	2640	title ? "\",title:\"" : "",
2913	title ? (const char *)title : "");	2641	title ? (const char *)title : "",
		2642	flag_desc (flagdesc, 512), type);
2914		2643
2915	if (env)	2644	if (env)
2916	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2645	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2917		2646
2918	if (map)	2647	if (map)
2919	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2648	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2920		2649
2921	return info;	2650	return info;
2922	}	2651	}
2923		2652
2924	const char *	2653	const char *
2925	object::debug_desc () const	2654	object::debug_desc () const
2926	{	2655	{
2927	static char info[256 * 3];	2656	static char info[3][256 * 4];
		2657	static int info_idx;
		2658
2928	return debug_desc (info);	2659	return debug_desc (info [++info_idx % 3]);
2929	}	2660	}
2930		2661
		2662	struct region *
		2663	object::region () const
		2664	{
		2665	return map ? map->region (x, y)
		2666	: region::default_region ();
		2667	}
		2668
		2669	const materialtype_t *
		2670	object::dominant_material () const
		2671	{
		2672	if (materialtype_t *mat = name_to_material (materialname))
		2673	return mat;
		2674
		2675	// omfg this is slow, this has to be temporary :)
		2676	shstr unknown ("unknown");
		2677
		2678	return name_to_material (unknown);
		2679	}
		2680
		2681	void
		2682	object::open_container (object *new_container)
		2683	{
		2684	if (container == new_container)
		2685	return;
		2686
		2687	if (object *old_container = container)
		2688	{
		2689	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2690	return;
		2691
		2692	#if 0
		2693	// remove the "Close old_container" object.
		2694	if (object *closer = old_container->inv)
		2695	if (closer->type == CLOSE_CON)
		2696	closer->destroy ();
		2697	#endif
		2698
		2699	old_container->flag [FLAG_APPLIED] = 0;
		2700	container = 0;
		2701
		2702	esrv_update_item (UPD_FLAGS, this, old_container);
		2703	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2704	}
		2705
		2706	if (new_container)
		2707	{
		2708	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2709	return;
		2710
		2711	// TODO: this does not seem to serve any purpose anymore?
		2712	#if 0
		2713	// insert the "Close Container" object.
		2714	if (archetype *closer = new_container->other_arch)
		2715	{
		2716	object *closer = arch_to_object (new_container->other_arch);
		2717	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2718	new_container->insert (closer);
		2719	}
		2720	#endif
		2721
		2722	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2723
		2724	new_container->flag [FLAG_APPLIED] = 1;
		2725	container = new_container;
		2726
		2727	esrv_update_item (UPD_FLAGS, this, new_container);
		2728	esrv_send_inventory (this, new_container);
		2729	}
		2730	}
		2731
		2732

Diff Legend

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