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.30 by root, Mon Sep 11 20:28:37 2006 UTC vs.
Revision 1.69 by root, Mon Dec 18 03:00:02 2006 UTC

1
2	/*	1	/*
3	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
4		3
5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
…		…
17		16
18	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
19	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21		20
22	The authors can be reached via e-mail at crossfire-devel@real-time.com	21	The authors can be reached via e-mail at <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
27	variable. */	26	variable. */
…		…
29	#include <stdio.h>	28	#include <stdio.h>
30	#include <sys/types.h>	29	#include <sys/types.h>
31	#include <sys/uio.h>	30	#include <sys/uio.h>
32	#include <object.h>	31	#include <object.h>
33	#include <funcpoint.h>	32	#include <funcpoint.h>
34	#include <skills.h>
35	#include <loader.h>	33	#include <loader.h>
36		34
		35	#include <bitset>
		36
37	int nrofallocobjects = 0;	37	int nrofallocobjects = 0;
		38	static UUID uuid;
		39	const uint64 UUID_SKIP = 1<<19;
38		40
39	object *objects; /* Pointer to the list of used objects */
40	object *active_objects; /* List of active objects that need to be processed */	41	object *active_objects; /* List of active objects that need to be processed */
41		42
42	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	43	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
43	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
44	};	45	};
…		…
51	int freedir[SIZEOFFREE] = {	52	int freedir[SIZEOFFREE] = {
52	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	53	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
53	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	54	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
54	};	55	};
55		56
		57	static void
		58	write_uuid (void)
		59	{
		60	char filename1[MAX_BUF], filename2[MAX_BUF];
		61
		62	sprintf (filename1, "%s/uuid", settings.localdir);
		63	sprintf (filename2, "%s/uuid~", settings.localdir);
		64
		65	FILE *fp;
		66
		67	if (!(fp = fopen (filename2, "w")))
		68	{
		69	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
		70	return;
		71	}
		72
		73	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
		74	fclose (fp);
		75	rename (filename2, filename1);
		76	}
		77
		78	static void
		79	read_uuid (void)
		80	{
		81	char filename[MAX_BUF];
		82
		83	sprintf (filename, "%s/uuid", settings.localdir);
		84
		85	FILE *fp;
		86
		87	if (!(fp = fopen (filename, "r")))
		88	{
		89	if (errno == ENOENT)
		90	{
		91	LOG (llevInfo, "RESET uid to 1\n");
		92	uuid.seq = 0;
		93	write_uuid ();
		94	return;
		95	}
		96
		97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
		98	_exit (1);
		99	}
		100
		101	int version;
		102	unsigned long long uid;
		103	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
		104	{
		105	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
		106	_exit (1);
		107	}
		108
		109	uuid.seq = uid;
		110	write_uuid ();
		111	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
		112	fclose (fp);
		113	}
		114
		115	UUID
		116	gen_uuid ()
		117	{
		118	UUID uid;
		119
		120	uid.seq = ++uuid.seq;
		121
		122	if (!(uuid.seq & (UUID_SKIP - 1)))
		123	write_uuid ();
		124
		125	return uid;
		126	}
		127
		128	void
		129	init_uuid ()
		130	{
		131	read_uuid ();
		132	}
		133
56	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	134	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
57	static int	135	static int
58	compare_ob_value_lists_one (const object *wants, const object *has)	136	compare_ob_value_lists_one (const object *wants, const object *has)
59	{	137	{
60	key_value *wants_field;	138	key_value *wants_field;
…		…
107	*	185	*
108	* Note that this function appears a lot longer than the macro it	186	* Note that this function appears a lot longer than the macro it
109	* replaces - this is mostly for clarity - a decent compiler should hopefully	187	* replaces - this is mostly for clarity - a decent compiler should hopefully
110	* reduce this to the same efficiency.	188	* reduce this to the same efficiency.
111	*	189	*
112	* Check nrof variable *before* calling CAN_MERGE()	190	* Check nrof variable *before* calling can_merge()
113	*	191	*
114	* Improvements made with merge: Better checking on potion, and also	192	* Improvements made with merge: Better checking on potion, and also
115	* check weight	193	* check weight
116	*/	194	*/
117		195
118	bool object::can_merge (object *ob1, object *ob2)	196	bool object::can_merge_slow (object *ob1, object *ob2)
119	{	197	{
120	/* A couple quicksanity checks */	198	/* A couple quicksanity checks */
121	if ((ob1 == ob2) || (ob1->type != ob2->type))	199	if (ob1 == ob2
		200	|| ob1->type != ob2->type
		201	|| ob1->speed != ob2->speed
		202	|| ob1->value != ob2->value
		203	|| ob1->name != ob2->name)
122	return 0;	204	return 0;
123		205
124	if (ob1->speed != ob2->speed)	206	//TODO: this ain't working well, use nicer and correct overflow check
125	return 0;
126
127	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	207	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
128	* value could not be stored in a sint32 (which unfortunately sometimes is	208	* value could not be stored in a sint32 (which unfortunately sometimes is
129	* used to store nrof).	209	* used to store nrof).
130	*/	210	*/
131	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
141	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
142		222
143	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
144	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
145		225
146		226	if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
147	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	227	|| ob1->arch != ob2->arch
148	* being locked in inventory should prevent merging.
149	* 0x4 in flags3 is CLIENT_SENT
150	*/
151	if ((ob1->arch != ob2->arch) ||
152	(ob1->flags[0] != ob2->flags[0]) ||
153	(ob1->flags[1] != ob2->flags[1]) ||
154	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
155	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
156	(ob1->name != ob2->name) ||	228	|| ob1->name != ob2->name
157	(ob1->title != ob2->title) ||	229	|| ob1->title != ob2->title
158	(ob1->msg != ob2->msg) ||	230	|| ob1->msg != ob2->msg
159	(ob1->weight != ob2->weight) ||	231	|| ob1->weight != ob2->weight
160	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	232	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
161	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	233	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
162	(ob1->attacktype != ob2->attacktype) ||	234	|| ob1->attacktype != ob2->attacktype
163	(ob1->magic != ob2->magic) ||	235	|| ob1->magic != ob2->magic
164	(ob1->slaying != ob2->slaying) ||	236	|| ob1->slaying != ob2->slaying
165	(ob1->skill != ob2->skill) ||	237	|| ob1->skill != ob2->skill
166	(ob1->value != ob2->value) ||	238	|| ob1->value != ob2->value
167	(ob1->animation_id != ob2->animation_id) ||	239	|| ob1->animation_id != ob2->animation_id
168	(ob1->client_type != ob2->client_type) ||	240	|| ob1->client_type != ob2->client_type
169	(ob1->materialname != ob2->materialname) ||	241	|| ob1->materialname != ob2->materialname
170	(ob1->lore != ob2->lore) ||	242	|| ob1->lore != ob2->lore
171	(ob1->subtype != ob2->subtype) ||	243	|| ob1->subtype != ob2->subtype
172	(ob1->move_type != ob2->move_type) ||	244	|| ob1->move_type != ob2->move_type
173	(ob1->move_block != ob2->move_block) ||	245	|| ob1->move_block != ob2->move_block
174	(ob1->move_allow != ob2->move_allow) ||	246	|| ob1->move_allow != ob2->move_allow
175	(ob1->move_on != ob2->move_on) ||	247	|| ob1->move_on != ob2->move_on
176	(ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty))	248	|| ob1->move_off != ob2->move_off
		249	|| ob1->move_slow != ob2->move_slow
		250	|| ob1->move_slow_penalty != ob2->move_slow_penalty)
177	return 0;	251	return 0;
178		252
179	/* This is really a spellbook check - really, we should	253	/* This is really a spellbook check - really, we should
180	* check all objects in the inventory.	254	* check all objects in the inventory.
181	*/	255	*/
…		…
184	/* if one object has inventory but the other doesn't, not equiv */	258	/* if one object has inventory but the other doesn't, not equiv */
185	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	259	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
186	return 0;	260	return 0;
187		261
188	/* Now check to see if the two inventory objects could merge */	262	/* Now check to see if the two inventory objects could merge */
189	if (!CAN_MERGE (ob1->inv, ob2->inv))	263	if (!object::can_merge (ob1->inv, ob2->inv))
190	return 0;	264	return 0;
191		265
192	/* inventory ok - still need to check rest of this object to see	266	/* inventory ok - still need to check rest of this object to see
193	* if it is valid.	267	* if it is valid.
194	*/	268	*/
…		…
255	{	329	{
256	if (inv->inv)	330	if (inv->inv)
257	sum_weight (inv);	331	sum_weight (inv);
258	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	332	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
259	}	333	}
		334
260	if (op->type == CONTAINER && op->stats.Str)	335	if (op->type == CONTAINER && op->stats.Str)
261	sum = (sum * (100 - op->stats.Str)) / 100;	336	sum = (sum * (100 - op->stats.Str)) / 100;
		337
262	if (op->carrying != sum)	338	if (op->carrying != sum)
263	op->carrying = sum;	339	op->carrying = sum;
		340
264	return sum;	341	return sum;
265	}	342	}
266		343
267	/**	344	/**
268	* Return the outermost environment object for a given object.	345	* Return the outermost environment object for a given object.
…		…
295	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	372	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
296	* Some error messages.	373	* Some error messages.
297	* The result of the dump is stored in the static global errmsg array.	374	* The result of the dump is stored in the static global errmsg array.
298	*/	375	*/
299		376
300	void	377	char *
301	dump_object2 (object *op)
302	{
303	errmsg[0] = 0;
304	return;
305	//TODO//D#d#
306	#if 0
307	char *cp;
308
309	/* object *tmp;*/
310
311	if (op->arch != NULL)
312	{
313	strcat (errmsg, "arch ");
314	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
315	strcat (errmsg, "\n");
316	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
317	strcat (errmsg, cp);
318	# if 0
319	/* Don't dump player diffs - they are too long, mostly meaningless, and
320	* will overflow the buffer.
321	* Changed so that we don't dump inventory either. This may
322	* also overflow the buffer.
323	*/
324	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
325	strcat (errmsg, cp);
326	for (tmp = op->inv; tmp; tmp = tmp->below)
327	dump_object2 (tmp);
328	# endif
329	strcat (errmsg, "end\n");
330	}
331	else
332	{
333	strcat (errmsg, "Object ");
334	if (op->name == NULL)
335	strcat (errmsg, "(null)");
336	else
337	strcat (errmsg, op->name);
338	strcat (errmsg, "\n");
339	# if 0
340	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
341	strcat (errmsg, cp);
342	for (tmp = op->inv; tmp; tmp = tmp->below)
343	dump_object2 (tmp);
344	# endif
345	strcat (errmsg, "end\n");
346	}
347	#endif
348	}
349
350	/*
351	* Dumps an object. Returns output in the static global errmsg array.
352	*/
353
354	void
355	dump_object (object *op)	378	dump_object (object *op)
356	{	379	{
357	if (op == NULL)	380	if (!op)
358	{	381	return strdup ("[NULLOBJ]");
359	strcpy (errmsg, "[NULL pointer]");
360	return;
361	}
362	errmsg[0] = '\0';
363	dump_object2 (op);
364	}
365		382
366	void	383	object_freezer freezer;
367	dump_all_objects (void)	384	save_object (freezer, op, 3);
368	{	385	return freezer.as_string ();
369	object *op;
370
371	for (op = objects; op != NULL; op = op->next)
372	{
373	dump_object (op);
374	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
375	}
376	}	386	}
377		387
378	/*	388	/*
379	* get_nearest_part(multi-object, object 2) returns the part of the	389	* get_nearest_part(multi-object, object 2) returns the part of the
380	* multi-object 1 which is closest to the second object.	390	* multi-object 1 which is closest to the second object.
…		…
400	*/	410	*/
401		411
402	object *	412	object *
403	find_object (tag_t i)	413	find_object (tag_t i)
404	{	414	{
405	object *op;	415	for (object *op = object::first; op; op = op->next)
406
407	for (op = objects; op != NULL; op = op->next)
408	if (op->count == i)	416	if (op->count == i)
409	break;	417	return op;
		418
410	return op;	419	return 0;
411	}	420	}
412		421
413	/*	422	/*
414	* Returns the first object which has a name equal to the argument.	423	* Returns the first object which has a name equal to the argument.
415	* Used only by the patch command, but not all that useful.	424	* Used only by the patch command, but not all that useful.
…		…
417	*/	426	*/
418		427
419	object *	428	object *
420	find_object_name (const char *str)	429	find_object_name (const char *str)
421	{	430	{
422	const char *name = shstr::find (str);	431	shstr_cmp str_ (str);
423	object *op;	432	object *op;
424		433
425	for (op = objects; op != NULL; op = op->next)	434	for (op = object::first; op != NULL; op = op->next)
426	if (&op->name == name)	435	if (op->name == str_)
427	break;	436	break;
428		437
429	return op;	438	return op;
430	}	439	}
431		440
432	void	441	void
433	free_all_object_data ()	442	free_all_object_data ()
434	{	443	{
435	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	444	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
436	}
437
438	/*
439	* Returns the object which this object marks as being the owner.
440	* A id-scheme is used to avoid pointing to objects which have been
441	* freed and are now reused. If this is detected, the owner is
442	* set to NULL, and NULL is returned.
443	* Changed 2004-02-12 - if the player is setting at the play again
444	* prompt, he is removed, and we don't want to treat him as an owner of
445	* anything, so check removed flag. I don't expect that this should break
446	* anything - once an object is removed, it is basically dead anyways.
447	*/
448	object *
449	object::get_owner ()
450	{
451	if (!owner
452	|| QUERY_FLAG (owner, FLAG_FREED)
453	|| QUERY_FLAG (owner, FLAG_REMOVED))
454	owner = 0;
455
456	return owner;
457	}	445	}
458		446
459	/*	447	/*
460	* Sets the owner and sets the skill and exp pointers to owner's current	448	* Sets the owner and sets the skill and exp pointers to owner's current
461	* skill and experience objects.	449	* skill and experience objects.
…		…
531		519
532	/* What is not cleared is next, prev, and count */	520	/* What is not cleared is next, prev, and count */
533		521
534	expmul = 1.0;	522	expmul = 1.0;
535	face = blank_face;	523	face = blank_face;
536	attacked_by_count = -1;
537		524
538	if (settings.casting_time)	525	if (settings.casting_time)
539	casting_time = -1;	526	casting_time = -1;
540	}	527	}
541		528
542	void object::clone (object *destination)
543	{
544	*(object_copy *)destination = *this;
545	*(object_pod *)destination = *this;
546
547	if (self || cb)
548	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
549	}
550
551	/*	529	/*
552	* copy object first frees everything allocated by the second object,	530	* copy_to first frees everything allocated by the dst object,
553	* and then copies the contends of the first object into the second	531	* and then copies the contents of itself into the second
554	* object, allocating what needs to be allocated. Basically, any	532	* object, allocating what needs to be allocated. Basically, any
555	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	533	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
556	* if the first object is freed, the pointers in the new object	534	* if the first object is freed, the pointers in the new object
557	* will point at garbage.	535	* will point at garbage.
558	*/	536	*/
559	void	537	void
560	copy_object (object *op2, object *op)	538	object::copy_to (object *dst)
561	{	539	{
562	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	540	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
563	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	541	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
564		542
565	op2->clone (op);	543	*(object_copy *)dst = *this;
		544	*(object_pod *)dst = *this;
		545
		546	if (self || cb)
		547	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
566		548
567	if (is_freed)	549	if (is_freed)
568	SET_FLAG (op, FLAG_FREED);	550	SET_FLAG (dst, FLAG_FREED);
		551
569	if (is_removed)	552	if (is_removed)
570	SET_FLAG (op, FLAG_REMOVED);	553	SET_FLAG (dst, FLAG_REMOVED);
571		554
572	if (op2->speed < 0)	555	if (speed < 0)
573	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	556	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
574		557
575	/* Copy over key_values, if any. */	558	/* Copy over key_values, if any. */
576	if (op2->key_values)	559	if (key_values)
577	{	560	{
578	key_value *tail = 0;	561	key_value *tail = 0;
579	key_value *i;	562	key_value *i;
580		563
581	op->key_values = 0;	564	dst->key_values = 0;
582		565
583	for (i = op2->key_values; i; i = i->next)	566	for (i = key_values; i; i = i->next)
584	{	567	{
585	key_value *new_link = new key_value;	568	key_value *new_link = new key_value;
586		569
587	new_link->next = 0;	570	new_link->next = 0;
588	new_link->key = i->key;	571	new_link->key = i->key;
589	new_link->value = i->value;	572	new_link->value = i->value;
590		573
591	/* Try and be clever here, too. */	574	/* Try and be clever here, too. */
592	if (!op->key_values)	575	if (!dst->key_values)
593	{	576	{
594	op->key_values = new_link;	577	dst->key_values = new_link;
595	tail = new_link;	578	tail = new_link;
596	}	579	}
597	else	580	else
598	{	581	{
599	tail->next = new_link;	582	tail->next = new_link;
600	tail = new_link;	583	tail = new_link;
601	}	584	}
602	}	585	}
603	}	586	}
604		587
605	update_ob_speed (op);	588	update_ob_speed (dst);
		589	}
		590
		591	object *
		592	object::clone ()
		593	{
		594	object *neu = create ();
		595	copy_to (neu);
		596	return neu;
606	}	597	}
607		598
608	/*	599	/*
609	* If an object with the IS_TURNABLE() flag needs to be turned due	600	* If an object with the IS_TURNABLE() flag needs to be turned due
610	* to the closest player being on the other side, this function can	601	* to the closest player being on the other side, this function can
…		…
623	/*	614	/*
624	* Updates the speed of an object. If the speed changes from 0 to another	615	* Updates the speed of an object. If the speed changes from 0 to another
625	* value, or vice versa, then add/remove the object from the active list.	616	* value, or vice versa, then add/remove the object from the active list.
626	* This function needs to be called whenever the speed of an object changes.	617	* This function needs to be called whenever the speed of an object changes.
627	*/	618	*/
628
629	void	619	void
630	update_ob_speed (object *op)	620	update_ob_speed (object *op)
631	{	621	{
632	extern int arch_init;	622	extern int arch_init;
633		623
…		…
642	abort ();	632	abort ();
643	#else	633	#else
644	op->speed = 0;	634	op->speed = 0;
645	#endif	635	#endif
646	}	636	}
		637
647	if (arch_init)	638	if (arch_init)
648	{
649	return;	639	return;
650	}	640
651	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	641	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
652	{	642	{
653	/* If already on active list, don't do anything */	643	/* If already on active list, don't do anything */
654	if (op->active_next || op->active_prev || op == active_objects)	644	if (op->active_next || op->active_prev || op == active_objects)
655	return;	645	return;
656		646
657	/* process_events() expects us to insert the object at the beginning	647	/* process_events() expects us to insert the object at the beginning
658	* of the list. */	648	* of the list. */
659	op->active_next = active_objects;	649	op->active_next = active_objects;
		650
660	if (op->active_next != NULL)	651	if (op->active_next != NULL)
661	op->active_next->active_prev = op;	652	op->active_next->active_prev = op;
		653
662	active_objects = op;	654	active_objects = op;
663	}	655	}
664	else	656	else
665	{	657	{
666	/* If not on the active list, nothing needs to be done */	658	/* If not on the active list, nothing needs to be done */
…		…
668	return;	660	return;
669		661
670	if (op->active_prev == NULL)	662	if (op->active_prev == NULL)
671	{	663	{
672	active_objects = op->active_next;	664	active_objects = op->active_next;
		665
673	if (op->active_next != NULL)	666	if (op->active_next != NULL)
674	op->active_next->active_prev = NULL;	667	op->active_next->active_prev = NULL;
675	}	668	}
676	else	669	else
677	{	670	{
678	op->active_prev->active_next = op->active_next;	671	op->active_prev->active_next = op->active_next;
		672
679	if (op->active_next)	673	if (op->active_next)
680	op->active_next->active_prev = op->active_prev;	674	op->active_next->active_prev = op->active_prev;
681	}	675	}
		676
682	op->active_next = NULL;	677	op->active_next = NULL;
683	op->active_prev = NULL;	678	op->active_prev = NULL;
684	}	679	}
685	}	680	}
686		681
…		…
811	update_now = 1;	806	update_now = 1;
812		807
813	if ((move_slow | op->move_slow) != move_slow)	808	if ((move_slow | op->move_slow) != move_slow)
814	update_now = 1;	809	update_now = 1;
815	}	810	}
		811
816	/* if the object is being removed, we can't make intelligent	812	/* if the object is being removed, we can't make intelligent
817	* decisions, because remove_ob can't really pass the object	813	* decisions, because remove_ob can't really pass the object
818	* that is being removed.	814	* that is being removed.
819	*/	815	*/
820	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	816	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
…		…
832		828
833	if (op->more != NULL)	829	if (op->more != NULL)
834	update_object (op->more, action);	830	update_object (op->more, action);
835	}	831	}
836		832
837	static unordered_vector<object *> mortals;	833	object::vector object::mortals;
838	static std::vector<object *> freed;	834	object::vector object::objects; // not yet used
		835	object *object::first;
839		836
840	void object::free_mortals ()	837	void object::free_mortals ()
841	{	838	{
842	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	839	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
843	if ((*i)->refcnt)	840	if ((*i)->refcnt)
844	++i; // further delay freeing	841	++i; // further delay freeing
845	else	842	else
846	{	843	{
847	freed.push_back (*i);//D
848	//delete *i;	844	delete *i;
849	mortals.erase (i);	845	mortals.erase (i);
850	}	846	}
851
852	if (mortals.size())//D
853	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
854	}	847	}
855		848
856	object::object ()	849	object::object ()
857	{	850	{
858	SET_FLAG (this, FLAG_REMOVED);	851	SET_FLAG (this, FLAG_REMOVED);
859		852
860	expmul = 1.0;	853	expmul = 1.0;
861	face = blank_face;	854	face = blank_face;
862	attacked_by_count = -1;
863	}	855	}
864		856
865	object::~object ()	857	object::~object ()
866	{	858	{
867	free_key_values (this);	859	free_key_values (this);
868	}	860	}
869		861
870	void object::link ()	862	void object::link ()
871	{	863	{
872	count = ++ob_count;	864	count = ++ob_count;
		865	uuid = gen_uuid ();
873		866
874	prev = 0;	867	prev = 0;
875	next = objects;	868	next = object::first;
876		869
877	if (objects)	870	if (object::first)
878	objects->prev = this;	871	object::first->prev = this;
879		872
880	objects = this;	873	object::first = this;
881	}	874	}
882		875
883	void object::unlink ()	876	void object::unlink ()
884	{	877	{
885	count = 0;	878	if (this == object::first)
		879	object::first = next;
886		880
887	/* Remove this object from the list of used objects */	881	/* Remove this object from the list of used objects */
888	if (prev)
889	{
890	prev->next = next;	882	if (prev) prev->next = next;
		883	if (next) next->prev = prev;
		884
891	prev = 0;	885	prev = 0;
892	}
893
894	if (next)
895	{
896	next->prev = prev;
897	next = 0;	886	next = 0;
898	}
899
900	if (this == objects)
901	objects = next;
902	}	887	}
903		888
904	object *object::create ()	889	object *object::create ()
905	{	890	{
906	object *
907	op;
908
909	if (freed.empty ())
910	op = new object;	891	object *op = new object;
911	else
912	{
913	// highly annoying, but the only way to get it stable right now
914	op = freed.back ();
915	freed.pop_back ();
916	op->~object ();
917	new ((void *) op) object;
918	}
919
920	op->link ();	892	op->link ();
921	return op;	893	return op;
922	}	894	}
923		895
924	/*	896	/*
…		…
926	* it from the list of used objects, and puts it on the list of	898	* it from the list of used objects, and puts it on the list of
927	* free objects. The IS_FREED() flag is set in the object.	899	* free objects. The IS_FREED() flag is set in the object.
928	* The object must have been removed by remove_ob() first for	900	* The object must have been removed by remove_ob() first for
929	* this function to succeed.	901	* this function to succeed.
930	*	902	*
931	* If free_inventory is set, free inventory as well. Else drop items in	903	* If destroy_inventory is set, free inventory as well. Else drop items in
932	* inventory to the ground.	904	* inventory to the ground.
933	*/	905	*/
934	void object::free (bool free_inventory)	906	void object::destroy (bool destroy_inventory)
935	{	907	{
936	if (QUERY_FLAG (this, FLAG_FREED))	908	if (QUERY_FLAG (this, FLAG_FREED))
937	return;	909	return;
938		910
939	if (!QUERY_FLAG (this, FLAG_REMOVED))
940	remove_ob (this);
941
942	if (QUERY_FLAG (this, FLAG_FRIENDLY))	911	if (QUERY_FLAG (this, FLAG_FRIENDLY))
943	remove_friendly_object (this);	912	remove_friendly_object (this);
944		913
		914	if (!QUERY_FLAG (this, FLAG_REMOVED))
		915	remove ();
		916
945	SET_FLAG (this, FLAG_FREED);	917	SET_FLAG (this, FLAG_FREED);
946		918
947	if (more)	919	if (more)
948	{	920	{
949	more->free (free_inventory);	921	more->destroy (destroy_inventory);
950	more = 0;	922	more = 0;
951	}	923	}
952		924
953	if (inv)	925	if (inv)
954	{	926	{
955	/* Only if the space blocks everything do we not process -	927	/* Only if the space blocks everything do we not process -
956	* if some form of movement is allowed, let objects	928	* if some form of movement is allowed, let objects
957	* drop on that space.	929	* drop on that space.
958	*/	930	*/
959	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	931	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
960	{	932	{
961	object *op = inv;	933	object *op = inv;
962		934
963	while (op)	935	while (op)
964	{	936	{
965	object *tmp = op->below;	937	object *tmp = op->below;
966	op->free (free_inventory);	938	op->destroy (destroy_inventory);
967	op = tmp;	939	op = tmp;
968	}	940	}
969	}	941	}
970	else	942	else
971	{ /* Put objects in inventory onto this space */	943	{ /* Put objects in inventory onto this space */
…		…
973		945
974	while (op)	946	while (op)
975	{	947	{
976	object *tmp = op->below;	948	object *tmp = op->below;
977		949
978	remove_ob (op);	950	op->remove ();
979		951
980	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	952	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
981	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	953	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
982	free_object (op);	954	op->destroy ();
983	else	955	else
984	{	956	{
985	op->x = x;	957	op->x = x;
986	op->y = y;	958	op->y = y;
987	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	959	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
990	op = tmp;	962	op = tmp;
991	}	963	}
992	}	964	}
993	}	965	}
994		966
		967	// hack to ensure that freed objects still have a valid map
		968	{
		969	static maptile *freed_map; // freed objects are moved here to avoid crashes
		970
		971	if (!freed_map)
		972	{
		973	freed_map = new maptile;
		974
		975	freed_map->name = "/internal/freed_objects_map";
		976	freed_map->width = 3;
		977	freed_map->height = 3;
		978
		979	freed_map->allocate ();
		980	}
		981
		982	map = freed_map;
		983	x = 1;
		984	y = 1;
		985	}
		986
		987	// clear those pointers that likely might have circular references to us
995	owner = 0;	988	owner = 0;
		989	enemy = 0;
		990	attacked_by = 0;
		991
		992	// only relevant for players(?), but make sure of it anyways
		993	contr = 0;
996		994
997	/* Remove object from the active list */	995	/* Remove object from the active list */
998	speed = 0;	996	speed = 0;
999	update_ob_speed (this);	997	update_ob_speed (this);
1000		998
…		…
1005		1003
1006	/*	1004	/*
1007	* sub_weight() recursively (outwards) subtracts a number from the	1005	* sub_weight() recursively (outwards) subtracts a number from the
1008	* weight of an object (and what is carried by it's environment(s)).	1006	* weight of an object (and what is carried by it's environment(s)).
1009	*/	1007	*/
1010
1011	void	1008	void
1012	sub_weight (object *op, signed long weight)	1009	sub_weight (object *op, signed long weight)
1013	{	1010	{
1014	while (op != NULL)	1011	while (op != NULL)
1015	{	1012	{
1016	if (op->type == CONTAINER)	1013	if (op->type == CONTAINER)
1017	{
1018	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1014	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1019	}	1015
1020	op->carrying -= weight;	1016	op->carrying -= weight;
1021	op = op->env;	1017	op = op->env;
1022	}	1018	}
1023	}	1019	}
1024		1020
1025	/* remove_ob(op):	1021	/* op->remove ():
1026	* This function removes the object op from the linked list of objects	1022	* This function removes the object op from the linked list of objects
1027	* which it is currently tied to. When this function is done, the	1023	* which it is currently tied to. When this function is done, the
1028	* object will have no environment. If the object previously had an	1024	* object will have no environment. If the object previously had an
1029	* environment, the x and y coordinates will be updated to	1025	* environment, the x and y coordinates will be updated to
1030	* the previous environment.	1026	* the previous environment.
1031	* Beware: This function is called from the editor as well!	1027	* Beware: This function is called from the editor as well!
1032	*/	1028	*/
1033
1034	void	1029	void
1035	remove_ob (object *op)	1030	object::remove ()
1036	{	1031	{
		1032	object *tmp, *last = 0;
1037	object *	1033	object *otmp;
1038	tmp, *
1039	last = NULL;
1040	object *
1041	otmp;
1042		1034
1043	tag_t
1044	tag;
1045	int
1046	check_walk_off;	1035	int check_walk_off;
1047	mapstruct *
1048	m;
1049		1036
1050	sint16
1051	x,
1052	y;
1053
1054	if (QUERY_FLAG (op, FLAG_REMOVED))	1037	if (QUERY_FLAG (this, FLAG_REMOVED))
1055	return;	1038	return;
1056		1039
1057	SET_FLAG (op, FLAG_REMOVED);	1040	SET_FLAG (this, FLAG_REMOVED);
1058		1041
1059	if (op->more != NULL)	1042	if (more)
1060	remove_ob (op->more);	1043	more->remove ();
1061		1044
1062	/*	1045	/*
1063	* In this case, the object to be removed is in someones	1046	* In this case, the object to be removed is in someones
1064	* inventory.	1047	* inventory.
1065	*/	1048	*/
1066	if (op->env != NULL)	1049	if (env)
1067	{	1050	{
1068	if (op->nrof)	1051	if (nrof)
1069	sub_weight (op->env, op->weight * op->nrof);	1052	sub_weight (env, weight * nrof);
1070	else	1053	else
1071	sub_weight (op->env, op->weight + op->carrying);	1054	sub_weight (env, weight + carrying);
1072		1055
1073	/* NO_FIX_PLAYER is set when a great many changes are being	1056	/* NO_FIX_PLAYER is set when a great many changes are being
1074	* made to players inventory. If set, avoiding the call	1057	* made to players inventory. If set, avoiding the call
1075	* to save cpu time.	1058	* to save cpu time.
1076	*/	1059	*/
1077	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1060	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1078	fix_player (otmp);	1061	fix_player (otmp);
1079		1062
1080	if (op->above != NULL)	1063	if (above != NULL)
1081	op->above->below = op->below;	1064	above->below = below;
1082	else	1065	else
1083	op->env->inv = op->below;	1066	env->inv = below;
1084		1067
1085	if (op->below != NULL)	1068	if (below != NULL)
1086	op->below->above = op->above;	1069	below->above = above;
1087		1070
1088	/* we set up values so that it could be inserted into	1071	/* we set up values so that it could be inserted into
1089	* the map, but we don't actually do that - it is up	1072	* the map, but we don't actually do that - it is up
1090	* to the caller to decide what we want to do.	1073	* to the caller to decide what we want to do.
1091	*/	1074	*/
1092	op->x = op->env->x, op->y = op->env->y;	1075	x = env->x, y = env->y;
1093	op->map = op->env->map;	1076	map = env->map;
1094	op->above = NULL, op->below = NULL;	1077	above = 0, below = 0;
1095	op->env = NULL;	1078	env = 0;
1096	}	1079	}
1097	else if (op->map)	1080	else if (map)
1098	{	1081	{
1099	x = op->x;
1100	y = op->y;
1101	m = get_map_from_coord (op->map, &x, &y);
1102
1103	if (!m)
1104	{
1105	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1106	op->map->path, op->x, op->y);
1107	/* in old days, we used to set x and y to 0 and continue.
1108	* it seems if we get into this case, something is probablye
1109	* screwed up and should be fixed.
1110	*/
1111	abort ();
1112	}
1113
1114	if (op->map != m)
1115	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1116	op->map->path, m->path, op->x, op->y, x, y);
1117
1118	/* Re did the following section of code - it looks like it had	1082	/* Re did the following section of code - it looks like it had
1119	* lots of logic for things we no longer care about	1083	* lots of logic for things we no longer care about
1120	*/	1084	*/
1121		1085
1122	/* link the object above us */	1086	/* link the object above us */
1123	if (op->above)	1087	if (above)
1124	op->above->below = op->below;	1088	above->below = below;
1125	else	1089	else
1126	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1090	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1127		1091
1128	/* Relink the object below us, if there is one */	1092	/* Relink the object below us, if there is one */
1129	if (op->below)	1093	if (below)
1130	op->below->above = op->above;	1094	below->above = above;
1131	else	1095	else
1132	{	1096	{
1133	/* Nothing below, which means we need to relink map object for this space	1097	/* Nothing below, which means we need to relink map object for this space
1134	* use translated coordinates in case some oddness with map tiling is	1098	* use translated coordinates in case some oddness with map tiling is
1135	* evident	1099	* evident
1136	*/	1100	*/
1137	if (GET_MAP_OB (m, x, y) != op)	1101	if (GET_MAP_OB (map, x, y) != this)
1138	{	1102	{
1139	dump_object (op);	1103	char *dump = dump_object (this);
1140	LOG (llevError,	1104	LOG (llevError,
1141	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);	1105	"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);
		1106	free (dump);
1142	dump_object (GET_MAP_OB (m, x, y));	1107	dump = dump_object (GET_MAP_OB (map, x, y));
1143	LOG (llevError, "%s\n", errmsg);	1108	LOG (llevError, "%s\n", dump);
		1109	free (dump);
1144	}	1110	}
1145		1111
1146	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1112	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1147	}	1113	}
1148		1114
1149	op->above = 0;	1115	above = 0;
1150	op->below = 0;	1116	below = 0;
1151		1117
1152	if (op->map->in_memory == MAP_SAVING)	1118	if (map->in_memory == MAP_SAVING)
1153	return;	1119	return;
1154		1120
1155	tag = op->count;
1156	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1121	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1157		1122
1158	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1123	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1159	{	1124	{
1160	/* No point updating the players look faces if he is the object	1125	/* No point updating the players look faces if he is the object
1161	* being removed.	1126	* being removed.
1162	*/	1127	*/
1163		1128
1164	if (tmp->type == PLAYER && tmp != op)	1129	if (tmp->type == PLAYER && tmp != this)
1165	{	1130	{
1166	/* If a container that the player is currently using somehow gets	1131	/* If a container that the player is currently using somehow gets
1167	* removed (most likely destroyed), update the player view	1132	* removed (most likely destroyed), update the player view
1168	* appropriately.	1133	* appropriately.
1169	*/	1134	*/
1170	if (tmp->container == op)	1135	if (tmp->container == this)
1171	{	1136	{
1172	CLEAR_FLAG (op, FLAG_APPLIED);	1137	CLEAR_FLAG (this, FLAG_APPLIED);
1173	tmp->container = NULL;	1138	tmp->container = 0;
1174	}	1139	}
1175		1140
1176	tmp->contr->socket.update_look = 1;	1141	tmp->contr->socket->update_look = 1;
1177	}	1142	}
1178		1143
1179	/* See if player moving off should effect something */	1144	/* See if player moving off should effect something */
1180	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1145	if (check_walk_off
		1146	&& ((move_type & tmp->move_off)
		1147	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1181	{	1148	{
1182	move_apply (tmp, op, NULL);	1149	move_apply (tmp, this, 0);
1183		1150
1184	if (was_destroyed (op, tag))	1151	if (destroyed ())
1185	{
1186	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1152	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1187	}
1188	}	1153	}
1189		1154
1190	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1155	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1191		1156
1192	if (tmp->above == tmp)	1157	if (tmp->above == tmp)
1193	tmp->above = NULL;	1158	tmp->above = 0;
1194		1159
1195	last = tmp;	1160	last = tmp;
1196	}	1161	}
1197		1162
1198	/* last == NULL of there are no objects on this space */	1163	/* last == NULL of there are no objects on this space */
1199	if (last == NULL)	1164	if (!last)
1200	{	1165	{
1201	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1166	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1202	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1167	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1203	* those out anyways, and if there are any flags set right now, they won't	1168	* those out anyways, and if there are any flags set right now, they won't
1204	* be correct anyways.	1169	* be correct anyways.
1205	*/	1170	*/
1206	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1171	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1207	update_position (op->map, op->x, op->y);	1172	update_position (map, x, y);
1208	}	1173	}
1209	else	1174	else
1210	update_object (last, UP_OBJ_REMOVE);	1175	update_object (last, UP_OBJ_REMOVE);
1211		1176
1212	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1177	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1213	update_all_los (op->map, op->x, op->y);	1178	update_all_los (map, x, y);
1214	}	1179	}
1215	}	1180	}
1216		1181
1217	/*	1182	/*
1218	* merge_ob(op,top):	1183	* merge_ob(op,top):
…		…
1220	* This function goes through all objects below and including top, and	1185	* This function goes through all objects below and including top, and
1221	* merges op to the first matching object.	1186	* merges op to the first matching object.
1222	* If top is NULL, it is calculated.	1187	* If top is NULL, it is calculated.
1223	* Returns pointer to object if it succeded in the merge, otherwise NULL	1188	* Returns pointer to object if it succeded in the merge, otherwise NULL
1224	*/	1189	*/
1225
1226	object *	1190	object *
1227	merge_ob (object *op, object *top)	1191	merge_ob (object *op, object *top)
1228	{	1192	{
1229	if (!op->nrof)	1193	if (!op->nrof)
1230	return 0;	1194	return 0;
…		…
1234		1198
1235	for (; top != NULL; top = top->below)	1199	for (; top != NULL; top = top->below)
1236	{	1200	{
1237	if (top == op)	1201	if (top == op)
1238	continue;	1202	continue;
1239	if (CAN_MERGE (op, top))	1203
		1204	if (object::can_merge (op, top))
1240	{	1205	{
1241	top->nrof += op->nrof;	1206	top->nrof += op->nrof;
1242		1207
1243	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1208	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1244	op->weight = 0; /* Don't want any adjustements now */	1209	op->weight = 0; /* Don't want any adjustements now */
1245	remove_ob (op);	1210	op->destroy ();
1246	free_object (op);
1247	return top;	1211	return top;
1248	}	1212	}
1249	}	1213	}
1250		1214
1251	return NULL;	1215	return 0;
1252	}	1216	}
1253		1217
1254	/*	1218	/*
1255	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1219	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1256	* job preparing multi-part monsters	1220	* job preparing multi-part monsters
1257	*/	1221	*/
1258	object *	1222	object *
1259	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1223	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1260	{	1224	{
1261	object *tmp;	1225	object *tmp;
1262		1226
1263	if (op->head)	1227	if (op->head)
1264	op = op->head;	1228	op = op->head;
…		…
1292	* NULL if 'op' was destroyed	1256	* NULL if 'op' was destroyed
1293	* just 'op' otherwise	1257	* just 'op' otherwise
1294	*/	1258	*/
1295		1259
1296	object *	1260	object *
1297	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1261	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1298	{	1262	{
1299	object *tmp, *top, *floor = NULL;	1263	object *tmp, *top, *floor = NULL;
1300	sint16 x, y;	1264	sint16 x, y;
1301		1265
1302	if (QUERY_FLAG (op, FLAG_FREED))	1266	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1305	return NULL;	1269	return NULL;
1306	}	1270	}
1307		1271
1308	if (m == NULL)	1272	if (m == NULL)
1309	{	1273	{
1310	dump_object (op);	1274	char *dump = dump_object (op);
1311	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1275	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1276	free (dump);
1312	return op;	1277	return op;
1313	}	1278	}
1314		1279
1315	if (out_of_map (m, op->x, op->y))	1280	if (out_of_map (m, op->x, op->y))
1316	{	1281	{
1317	dump_object (op);	1282	char *dump = dump_object (op);
1318	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1283	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1319	#ifdef MANY_CORES	1284	#ifdef MANY_CORES
1320	/* Better to catch this here, as otherwise the next use of this object	1285	/* Better to catch this here, as otherwise the next use of this object
1321	* is likely to cause a crash. Better to find out where it is getting	1286	* is likely to cause a crash. Better to find out where it is getting
1322	* improperly inserted.	1287	* improperly inserted.
1323	*/	1288	*/
1324	abort ();	1289	abort ();
1325	#endif	1290	#endif
		1291	free (dump);
1326	return op;	1292	return op;
1327	}	1293	}
1328		1294
1329	if (!QUERY_FLAG (op, FLAG_REMOVED))	1295	if (!QUERY_FLAG (op, FLAG_REMOVED))
1330	{	1296	{
1331	dump_object (op);	1297	char *dump = dump_object (op);
1332	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1298	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1299	free (dump);
1333	return op;	1300	return op;
1334	}	1301	}
1335		1302
1336	if (op->more != NULL)	1303	if (op->more != NULL)
1337	{	1304	{
…		…
1375		1342
1376	/* this has to be done after we translate the coordinates.	1343	/* this has to be done after we translate the coordinates.
1377	*/	1344	*/
1378	if (op->nrof && !(flag & INS_NO_MERGE))	1345	if (op->nrof && !(flag & INS_NO_MERGE))
1379	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1346	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1380	if (CAN_MERGE (op, tmp))	1347	if (object::can_merge (op, tmp))
1381	{	1348	{
1382	op->nrof += tmp->nrof;	1349	op->nrof += tmp->nrof;
1383	remove_ob (tmp);	1350	tmp->destroy ();
1384	free_object (tmp);
1385	}	1351	}
1386		1352
1387	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1353	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1388	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1354	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1389		1355
…		…
1517	* it, so save a few ticks and start from there.	1483	* it, so save a few ticks and start from there.
1518	*/	1484	*/
1519	if (!(flag & INS_MAP_LOAD))	1485	if (!(flag & INS_MAP_LOAD))
1520	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1486	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1521	if (tmp->type == PLAYER)	1487	if (tmp->type == PLAYER)
1522	tmp->contr->socket.update_look = 1;	1488	tmp->contr->socket->update_look = 1;
1523		1489
1524	/* If this object glows, it may affect lighting conditions that are	1490	/* If this object glows, it may affect lighting conditions that are
1525	* visible to others on this map. But update_all_los is really	1491	* visible to others on this map. But update_all_los is really
1526	* an inefficient way to do this, as it means los for all players	1492	* an inefficient way to do this, as it means los for all players
1527	* on the map will get recalculated. The players could very well	1493	* on the map will get recalculated. The players could very well
…		…
1575	tmp1;	1541	tmp1;
1576		1542
1577	/* first search for itself and remove any old instances */	1543	/* first search for itself and remove any old instances */
1578		1544
1579	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1545	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1580	{
1581	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1546	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1582	{	1547	tmp->destroy ();
1583	remove_ob (tmp);
1584	free_object (tmp);
1585	}
1586	}
1587		1548
1588	tmp1 = arch_to_object (find_archetype (arch_string));	1549	tmp1 = arch_to_object (archetype::find (arch_string));
1589		1550
1590	tmp1->x = op->x;	1551	tmp1->x = op->x;
1591	tmp1->y = op->y;	1552	tmp1->y = op->y;
1592	insert_ob_in_map (tmp1, op->map, op, 0);	1553	insert_ob_in_map (tmp1, op->map, op, 0);
1593	}	1554	}
…		…
1601	*/	1562	*/
1602		1563
1603	object *	1564	object *
1604	get_split_ob (object *orig_ob, uint32 nr)	1565	get_split_ob (object *orig_ob, uint32 nr)
1605	{	1566	{
1606	object *	1567	object *newob;
1607	newob;
1608	int
1609	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1568	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1610		1569
1611	if (orig_ob->nrof < nr)	1570	if (orig_ob->nrof < nr)
1612	{	1571	{
1613	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1572	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1614	return NULL;	1573	return NULL;
1615	}	1574	}
1616		1575
1617	newob = object_create_clone (orig_ob);	1576	newob = object_create_clone (orig_ob);
1618		1577
1619	if ((orig_ob->nrof -= nr) < 1)	1578	if ((orig_ob->nrof -= nr) < 1)
1620	{	1579	orig_ob->destroy (1);
1621	if (!is_removed)
1622	remove_ob (orig_ob);
1623	free_object2 (orig_ob, 1);
1624	}
1625	else if (!is_removed)	1580	else if (!is_removed)
1626	{	1581	{
1627	if (orig_ob->env != NULL)	1582	if (orig_ob->env != NULL)
1628	sub_weight (orig_ob->env, orig_ob->weight * nr);	1583	sub_weight (orig_ob->env, orig_ob->weight * nr);
1629	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1584	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1693	esrv_send_item (tmp, op);	1648	esrv_send_item (tmp, op);
1694	}	1649	}
1695	}	1650	}
1696	else	1651	else
1697	{	1652	{
1698	remove_ob (op);	1653	op->remove ();
1699	op->nrof = 0;	1654	op->nrof = 0;
1700	if (tmp)	1655	if (tmp)
1701	{	1656	{
1702	esrv_del_item (tmp->contr, op->count);	1657	esrv_del_item (tmp->contr, op->count);
1703	}	1658	}
…		…
1709		1664
1710	if (i < op->nrof)	1665	if (i < op->nrof)
1711	op->nrof -= i;	1666	op->nrof -= i;
1712	else	1667	else
1713	{	1668	{
1714	remove_ob (op);	1669	op->remove ();
1715	op->nrof = 0;	1670	op->nrof = 0;
1716	}	1671	}
1717		1672
1718	/* Since we just removed op, op->above is null */	1673	/* Since we just removed op, op->above is null */
1719	for (tmp = above; tmp != NULL; tmp = tmp->above)	1674	for (tmp = above; tmp != NULL; tmp = tmp->above)
…		…
1728		1683
1729	if (op->nrof)	1684	if (op->nrof)
1730	return op;	1685	return op;
1731	else	1686	else
1732	{	1687	{
1733	free_object (op);	1688	op->destroy ();
1734	return NULL;	1689	return NULL;
1735	}	1690	}
1736	}	1691	}
1737		1692
1738	/*	1693	/*
…		…
1751	op->carrying += weight;	1706	op->carrying += weight;
1752	op = op->env;	1707	op = op->env;
1753	}	1708	}
1754	}	1709	}
1755		1710
		1711	object *
		1712	insert_ob_in_ob (object *op, object *where)
		1713	{
		1714	if (!where)
		1715	{
		1716	char *dump = dump_object (op);
		1717	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1718	free (dump);
		1719	return op;
		1720	}
		1721
		1722	if (where->head)
		1723	{
		1724	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1725	where = where->head;
		1726	}
		1727
		1728	return where->insert (op);
		1729	}
		1730
1756	/*	1731	/*
1757	* insert_ob_in_ob(op,environment):	1732	* env->insert (op)
1758	* This function inserts the object op in the linked list	1733	* This function inserts the object op in the linked list
1759	* inside the object environment.	1734	* inside the object environment.
1760	*	1735	*
1761	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1762	* the inventory at the last position or next to other objects of the same
1763	* type.
1764	* Frank: Now sorted by type, archetype and magic!
1765	*
1766	* The function returns now pointer to inserted item, and return value can	1736	* The function returns now pointer to inserted item, and return value can
1767	* be != op, if items are merged. -Tero	1737	* be != op, if items are merged. -Tero
1768	*/	1738	*/
1769		1739
1770	object *	1740	object *
1771	insert_ob_in_ob (object *op, object *where)	1741	object::insert (object *op)
1772	{	1742	{
1773	object *	1743	object *tmp, *otmp;
1774	tmp, *
1775	otmp;
1776		1744
1777	if (!QUERY_FLAG (op, FLAG_REMOVED))	1745	if (!QUERY_FLAG (op, FLAG_REMOVED))
1778	{	1746	op->remove ();
1779	dump_object (op);
1780	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1781	return op;
1782	}
1783
1784	if (where == NULL)
1785	{
1786	dump_object (op);
1787	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1788	return op;
1789	}
1790
1791	if (where->head)
1792	{
1793	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1794	where = where->head;
1795	}
1796		1747
1797	if (op->more)	1748	if (op->more)
1798	{	1749	{
1799	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1750	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1800	return op;	1751	return op;
…		…
1802		1753
1803	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1754	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1804	CLEAR_FLAG (op, FLAG_REMOVED);	1755	CLEAR_FLAG (op, FLAG_REMOVED);
1805	if (op->nrof)	1756	if (op->nrof)
1806	{	1757	{
1807	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1758	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1808	if (CAN_MERGE (tmp, op))	1759	if (object::can_merge (tmp, op))
1809	{	1760	{
1810	/* return the original object and remove inserted object	1761	/* return the original object and remove inserted object
1811	(client needs the original object) */	1762	(client needs the original object) */
1812	tmp->nrof += op->nrof;	1763	tmp->nrof += op->nrof;
1813	/* Weight handling gets pretty funky. Since we are adding to	1764	/* Weight handling gets pretty funky. Since we are adding to
1814	* tmp->nrof, we need to increase the weight.	1765	* tmp->nrof, we need to increase the weight.
1815	*/	1766	*/
1816	add_weight (where, op->weight * op->nrof);	1767	add_weight (this, op->weight * op->nrof);
1817	SET_FLAG (op, FLAG_REMOVED);	1768	SET_FLAG (op, FLAG_REMOVED);
1818	free_object (op); /* free the inserted object */	1769	op->destroy (); /* free the inserted object */
1819	op = tmp;	1770	op = tmp;
1820	remove_ob (op); /* and fix old object's links */	1771	op->remove (); /* and fix old object's links */
1821	CLEAR_FLAG (op, FLAG_REMOVED);	1772	CLEAR_FLAG (op, FLAG_REMOVED);
1822	break;	1773	break;
1823	}	1774	}
1824		1775
1825	/* I assume combined objects have no inventory	1776	/* I assume combined objects have no inventory
1826	* We add the weight - this object could have just been removed	1777	* We add the weight - this object could have just been removed
1827	* (if it was possible to merge). calling remove_ob will subtract	1778	* (if it was possible to merge). calling remove_ob will subtract
1828	* the weight, so we need to add it in again, since we actually do	1779	* the weight, so we need to add it in again, since we actually do
1829	* the linking below	1780	* the linking below
1830	*/	1781	*/
1831	add_weight (where, op->weight * op->nrof);	1782	add_weight (this, op->weight * op->nrof);
1832	}	1783	}
1833	else	1784	else
1834	add_weight (where, (op->weight + op->carrying));	1785	add_weight (this, (op->weight + op->carrying));
1835		1786
1836	otmp = is_player_inv (where);	1787	otmp = is_player_inv (this);
1837	if (otmp && otmp->contr != NULL)	1788	if (otmp && otmp->contr)
1838	{
1839	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1789	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1840	fix_player (otmp);	1790	fix_player (otmp);
1841	}
1842		1791
1843	op->map = NULL;	1792	op->map = NULL;
1844	op->env = where;	1793	op->env = this;
1845	op->above = NULL;	1794	op->above = NULL;
1846	op->below = NULL;	1795	op->below = NULL;
1847	op->x = 0, op->y = 0;	1796	op->x = 0, op->y = 0;
1848		1797
1849	/* reset the light list and los of the players on the map */	1798	/* reset the light list and los of the players on the map */
1850	if ((op->glow_radius != 0) && where->map)	1799	if ((op->glow_radius != 0) && map)
1851	{	1800	{
1852	#ifdef DEBUG_LIGHTS	1801	#ifdef DEBUG_LIGHTS
1853	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1802	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1854	#endif /* DEBUG_LIGHTS */	1803	#endif /* DEBUG_LIGHTS */
1855	if (MAP_DARKNESS (where->map))	1804	if (MAP_DARKNESS (map))
1856	update_all_los (where->map, where->x, where->y);	1805	update_all_los (map, x, y);
1857	}	1806	}
1858		1807
1859	/* Client has no idea of ordering so lets not bother ordering it here.	1808	/* Client has no idea of ordering so lets not bother ordering it here.
1860	* It sure simplifies this function...	1809	* It sure simplifies this function...
1861	*/	1810	*/
1862	if (where->inv == NULL)	1811	if (!inv)
1863	where->inv = op;	1812	inv = op;
1864	else	1813	else
1865	{	1814	{
1866	op->below = where->inv;	1815	op->below = inv;
1867	op->below->above = op;	1816	op->below->above = op;
1868	where->inv = op;	1817	inv = op;
1869	}	1818	}
		1819
1870	return op;	1820	return op;
1871	}	1821	}
1872		1822
1873	/*	1823	/*
1874	* Checks if any objects has a move_type that matches objects	1824	* Checks if any objects has a move_type that matches objects
…		…
1892	*/	1842	*/
1893		1843
1894	int	1844	int
1895	check_move_on (object *op, object *originator)	1845	check_move_on (object *op, object *originator)
1896	{	1846	{
1897	object *	1847	object *tmp;
1898	tmp;	1848	maptile *m = op->map;
1899	tag_t
1900	tag;
1901	mapstruct *
1902	m = op->map;
1903	int
1904	x = op->x, y = op->y;	1849	int x = op->x, y = op->y;
1905		1850
1906	MoveType	1851	MoveType move_on, move_slow, move_block;
1907	move_on,
1908	move_slow,
1909	move_block;
1910		1852
1911	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1853	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1912	return 0;	1854	return 0;
1913
1914	tag = op->count;
1915		1855
1916	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1856	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1917	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1857	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1918	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1858	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1919		1859
…		…
1980	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1920	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1981	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1921	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1982	{	1922	{
1983	move_apply (tmp, op, originator);	1923	move_apply (tmp, op, originator);
1984		1924
1985	if (was_destroyed (op, tag))	1925	if (op->destroyed ())
1986	return 1;	1926	return 1;
1987		1927
1988	/* what the person/creature stepped onto has moved the object	1928	/* what the person/creature stepped onto has moved the object
1989	* someplace new. Don't process any further - if we did,	1929	* someplace new. Don't process any further - if we did,
1990	* have a feeling strange problems would result.	1930	* have a feeling strange problems would result.
…		…
2002	* a matching archetype at the given map and coordinates.	1942	* a matching archetype at the given map and coordinates.
2003	* The first matching object is returned, or NULL if none.	1943	* The first matching object is returned, or NULL if none.
2004	*/	1944	*/
2005		1945
2006	object *	1946	object *
2007	present_arch (const archetype *at, mapstruct *m, int x, int y)	1947	present_arch (const archetype *at, maptile *m, int x, int y)
2008	{	1948	{
2009	object *	1949	object *
2010	tmp;	1950	tmp;
2011		1951
2012	if (m == NULL || out_of_map (m, x, y))	1952	if (m == NULL || out_of_map (m, x, y))
…		…
2025	* a matching type variable at the given map and coordinates.	1965	* a matching type variable at the given map and coordinates.
2026	* The first matching object is returned, or NULL if none.	1966	* The first matching object is returned, or NULL if none.
2027	*/	1967	*/
2028		1968
2029	object *	1969	object *
2030	present (unsigned char type, mapstruct *m, int x, int y)	1970	present (unsigned char type, maptile *m, int x, int y)
2031	{	1971	{
2032	object *	1972	object *
2033	tmp;	1973	tmp;
2034		1974
2035	if (out_of_map (m, x, y))	1975	if (out_of_map (m, x, y))
…		…
2175	* the archetype because that isn't correct if the monster has been	2115	* the archetype because that isn't correct if the monster has been
2176	* customized, changed states, etc.	2116	* customized, changed states, etc.
2177	*/	2117	*/
2178		2118
2179	int	2119	int
2180	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2120	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2181	{	2121	{
2182	int	2122	int
2183	i,	2123	i,
2184	index = 0, flag;	2124	index = 0, flag;
2185	static int	2125	static int
…		…
2206	return -1;	2146	return -1;
2207	return altern[RANDOM () % index];	2147	return altern[RANDOM () % index];
2208	}	2148	}
2209		2149
2210	/*	2150	/*
2211	* find_first_free_spot(archetype, mapstruct, x, y) works like	2151	* find_first_free_spot(archetype, maptile, x, y) works like
2212	* find_free_spot(), but it will search max number of squares.	2152	* find_free_spot(), but it will search max number of squares.
2213	* But it will return the first available spot, not a random choice.	2153	* But it will return the first available spot, not a random choice.
2214	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2154	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2215	*/	2155	*/
2216		2156
2217	int	2157	int
2218	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2158	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2219	{	2159	{
2220	int	2160	int
2221	i;	2161	i;
2222		2162
2223	for (i = 0; i < SIZEOFFREE; i++)	2163	for (i = 0; i < SIZEOFFREE; i++)
…		…
2287	* because we have to know what movement the thing looking to move	2227	* because we have to know what movement the thing looking to move
2288	* there is capable of.	2228	* there is capable of.
2289	*/	2229	*/
2290		2230
2291	int	2231	int
2292	find_dir (mapstruct *m, int x, int y, object *exclude)	2232	find_dir (maptile *m, int x, int y, object *exclude)
2293	{	2233	{
2294	int	2234	int
2295	i,	2235	i,
2296	max = SIZEOFFREE, mflags;	2236	max = SIZEOFFREE, mflags;
2297		2237
2298	sint16 nx, ny;	2238	sint16 nx, ny;
2299	object *	2239	object *
2300	tmp;	2240	tmp;
2301	mapstruct *	2241	maptile *
2302	mp;	2242	mp;
2303		2243
2304	MoveType blocked, move_type;	2244	MoveType blocked, move_type;
2305		2245
2306	if (exclude && exclude->head)	2246	if (exclude && exclude->head)
…		…
2514	* Modified to be map tile aware -.MSW	2454	* Modified to be map tile aware -.MSW
2515	*/	2455	*/
2516		2456
2517		2457
2518	int	2458	int
2519	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2459	can_see_monsterP (maptile *m, int x, int y, int dir)
2520	{	2460	{
2521	sint16 dx, dy;	2461	sint16 dx, dy;
2522	int	2462	int
2523	mflags;	2463	mflags;
2524		2464
…		…
2573	* create clone from object to another	2513	* create clone from object to another
2574	*/	2514	*/
2575	object *	2515	object *
2576	object_create_clone (object *asrc)	2516	object_create_clone (object *asrc)
2577	{	2517	{
2578	object *
2579	dst = NULL, *tmp, *src, *part, *prev, *item;	2518	object *dst = 0, *tmp, *src, *part, *prev, *item;
2580		2519
2581	if (!asrc)	2520	if (!asrc)
2582	return NULL;	2521	return 0;
		2522
2583	src = asrc;	2523	src = asrc;
2584	if (src->head)	2524	if (src->head)
2585	src = src->head;	2525	src = src->head;
2586		2526
2587	prev = NULL;	2527	prev = 0;
2588	for (part = src; part; part = part->more)	2528	for (part = src; part; part = part->more)
2589	{	2529	{
2590	tmp = get_object ();	2530	tmp = part->clone ();
2591	copy_object (part, tmp);
2592	tmp->x -= src->x;	2531	tmp->x -= src->x;
2593	tmp->y -= src->y;	2532	tmp->y -= src->y;
		2533
2594	if (!part->head)	2534	if (!part->head)
2595	{	2535	{
2596	dst = tmp;	2536	dst = tmp;
2597	tmp->head = NULL;	2537	tmp->head = 0;
2598	}	2538	}
2599	else	2539	else
2600	{	2540	{
2601	tmp->head = dst;	2541	tmp->head = dst;
2602	}	2542	}
		2543
2603	tmp->more = NULL;	2544	tmp->more = 0;
		2545
2604	if (prev)	2546	if (prev)
2605	prev->more = tmp;	2547	prev->more = tmp;
		2548
2606	prev = tmp;	2549	prev = tmp;
2607	}	2550	}
2608		2551
2609	/*** copy inventory ***/
2610	for (item = src->inv; item; item = item->below)	2552	for (item = src->inv; item; item = item->below)
2611	{
2612	(void) insert_ob_in_ob (object_create_clone (item), dst);	2553	insert_ob_in_ob (object_create_clone (item), dst);
2613	}
2614		2554
2615	return dst;	2555	return dst;
2616	}	2556	}
2617		2557
2618	/* return true if the object was destroyed, 0 otherwise */
2619	int
2620	was_destroyed (const object *op, tag_t old_tag)
2621	{
2622	/* checking for FLAG_FREED isn't necessary, but makes this function more
2623	* robust */
2624	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2625	}
2626
2627	/* GROS - Creates an object using a string representing its content. */	2558	/* GROS - Creates an object using a string representing its content. */
2628
2629	/* Basically, we save the content of the string to a temp file, then call */	2559	/* Basically, we save the content of the string to a temp file, then call */
2630
2631	/* load_object on it. I admit it is a highly inefficient way to make things, */	2560	/* load_object on it. I admit it is a highly inefficient way to make things, */
2632
2633	/* but it was simple to make and allows reusing the load_object function. */	2561	/* but it was simple to make and allows reusing the load_object function. */
2634
2635	/* Remember not to use load_object_str in a time-critical situation. */	2562	/* Remember not to use load_object_str in a time-critical situation. */
2636
2637	/* Also remember that multiparts objects are not supported for now. */	2563	/* Also remember that multiparts objects are not supported for now. */
2638		2564
2639	object *	2565	object *
2640	load_object_str (const char *obstr)	2566	load_object_str (const char *obstr)
2641	{	2567	{
2642	object *	2568	object *op;
2643	op;
2644	char
2645	filename[MAX_BUF];	2569	char filename[MAX_BUF];
2646		2570
2647	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2571	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2648		2572
2649	FILE *
2650	tempfile = fopen (filename, "w");	2573	FILE *tempfile = fopen (filename, "w");
2651		2574
2652	if (tempfile == NULL)	2575	if (tempfile == NULL)
2653	{	2576	{
2654	LOG (llevError, "Error - Unable to access load object temp file\n");	2577	LOG (llevError, "Error - Unable to access load object temp file\n");
2655	return NULL;	2578	return NULL;
2656	};	2579	}
		2580
2657	fprintf (tempfile, obstr);	2581	fprintf (tempfile, obstr);
2658	fclose (tempfile);	2582	fclose (tempfile);
2659		2583
2660	op = get_object ();	2584	op = object::create ();
2661		2585
2662	object_thawer thawer (filename);	2586	object_thawer thawer (filename);
2663		2587
2664	if (thawer)	2588	if (thawer)
2665	load_object (thawer, op, 0);	2589	load_object (thawer, op, 0);
…		…
2675	* returns NULL if no match.	2599	* returns NULL if no match.
2676	*/	2600	*/
2677	object *	2601	object *
2678	find_obj_by_type_subtype (const object *who, int type, int subtype)	2602	find_obj_by_type_subtype (const object *who, int type, int subtype)
2679	{	2603	{
2680	object *	2604	object *tmp;
2681	tmp;
2682		2605
2683	for (tmp = who->inv; tmp; tmp = tmp->below)	2606	for (tmp = who->inv; tmp; tmp = tmp->below)
2684	if (tmp->type == type && tmp->subtype == subtype)	2607	if (tmp->type == type && tmp->subtype == subtype)
2685	return tmp;	2608	return tmp;
2686		2609
…		…
2694	* do the desired thing.	2617	* do the desired thing.
2695	*/	2618	*/
2696	key_value *	2619	key_value *
2697	get_ob_key_link (const object *ob, const char *key)	2620	get_ob_key_link (const object *ob, const char *key)
2698	{	2621	{
2699	key_value *	2622	key_value *link;
2700	link;
2701		2623
2702	for (link = ob->key_values; link != NULL; link = link->next)	2624	for (link = ob->key_values; link != NULL; link = link->next)
2703	{
2704	if (link->key == key)	2625	if (link->key == key)
2705	{
2706	return link;	2626	return link;
2707	}
2708	}
2709		2627
2710	return NULL;	2628	return NULL;
2711	}	2629	}
2712		2630
2713	/*	2631	/*
…		…
2718	* The returned string is shared.	2636	* The returned string is shared.
2719	*/	2637	*/
2720	const char *	2638	const char *
2721	get_ob_key_value (const object *op, const char *const key)	2639	get_ob_key_value (const object *op, const char *const key)
2722	{	2640	{
2723	key_value *	2641	key_value *link;
2724	link;	2642	shstr_cmp canonical_key (key);
2725	const char *
2726	canonical_key;
2727		2643
2728	canonical_key = shstr::find (key);
2729
2730	if (canonical_key == NULL)	2644	if (!canonical_key)
2731	{	2645	{
2732	/* 1. There being a field named key on any object	2646	/* 1. There being a field named key on any object
2733	* implies there'd be a shared string to find.	2647	* implies there'd be a shared string to find.
2734	* 2. Since there isn't, no object has this field.	2648	* 2. Since there isn't, no object has this field.
2735	* 3. Therefore, *this* object doesn't have this field.	2649	* 3. Therefore, *this* object doesn't have this field.
2736	*/	2650	*/
2737	return NULL;	2651	return 0;
2738	}	2652	}
2739		2653
2740	/* This is copied from get_ob_key_link() above -	2654	/* This is copied from get_ob_key_link() above -
2741	* only 4 lines, and saves the function call overhead.	2655	* only 4 lines, and saves the function call overhead.
2742	*/	2656	*/
2743	for (link = op->key_values; link != NULL; link = link->next)	2657	for (link = op->key_values; link; link = link->next)
2744	{
2745	if (link->key == canonical_key)	2658	if (link->key == canonical_key)
2746	{
2747	return link->value;	2659	return link->value;
2748	}	2660
2749	}
2750	return NULL;	2661	return 0;
2751	}	2662	}
2752		2663
2753		2664
2754	/*	2665	/*
2755	* Updates the canonical_key in op to value.	2666	* Updates the canonical_key in op to value.
…		…
2840	{	2751	{
2841	shstr key_ (key);	2752	shstr key_ (key);
2842		2753
2843	return set_ob_key_value_s (op, key_, value, add_key);	2754	return set_ob_key_value_s (op, key_, value, add_key);
2844	}	2755	}
		2756
		2757	object::depth_iterator::depth_iterator (object *container)
		2758	: iterator_base (container)
		2759	{
		2760	while (item->inv)
		2761	item = item->inv;
		2762	}
		2763
		2764	void
		2765	object::depth_iterator::next ()
		2766	{
		2767	if (item->below)
		2768	{
		2769	item = item->below;
		2770
		2771	while (item->inv)
		2772	item = item->inv;
		2773	}
		2774	else
		2775	item = item->env;
		2776	}
		2777
		2778	// return a suitable string describing an objetc in enough detail to find it
		2779	const char *
		2780	object::debug_desc (char *info) const
		2781	{
		2782	char info2[256 * 3];
		2783	char *p = info;
		2784
		2785	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2786	count,
		2787	&name,
		2788	title ? " " : "",
		2789	title ? (const char *)title : "");
		2790
		2791	if (env)
		2792	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2793
		2794	if (map)
		2795	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2796
		2797	return info;
		2798	}
		2799
		2800	const char *
		2801	object::debug_desc () const
		2802	{
		2803	static char info[256 * 3];
		2804	return debug_desc (info);
		2805	}
		2806

Diff Legend

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