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.55 by root, Sun Dec 3 00:41:33 2006 UTC vs.
Revision 1.145 by root, Mon May 7 03:05:58 2007 UTC

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

Diff Legend

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