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.45 by root, Thu Sep 14 18:13:01 2006 UTC vs.
Revision 1.152 by root, Thu May 17 14:14:54 2007 UTC

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

Diff Legend

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