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.34 by root, Tue Sep 12 01:09:53 2006 UTC vs.
Revision 1.74 by root, Wed Dec 20 09:14:21 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. */
…		…
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 <loader.h>	33	#include <loader.h>
35		34
		35	#include <bitset>
		36
36	int nrofallocobjects = 0;	37	int nrofallocobjects = 0;
		38	static UUID uuid;
		39	const uint64 UUID_SKIP = 1<<19;
37		40
38	object *objects; /* Pointer to the list of used objects */
39	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 */
40		42
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,	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,
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	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
43	};	45	};
…		…
50	int freedir[SIZEOFFREE] = {	52	int freedir[SIZEOFFREE] = {
51	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,
52	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
53	};	55	};
54		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
55	/* 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. */
56	static int	135	static int
57	compare_ob_value_lists_one (const object *wants, const object *has)	136	compare_ob_value_lists_one (const object *wants, const object *has)
58	{	137	{
59	key_value *wants_field;	138	key_value *wants_field;
…		…
106	*	185	*
107	* 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
108	* replaces - this is mostly for clarity - a decent compiler should hopefully	187	* replaces - this is mostly for clarity - a decent compiler should hopefully
109	* reduce this to the same efficiency.	188	* reduce this to the same efficiency.
110	*	189	*
111	* Check nrof variable *before* calling CAN_MERGE()	190	* Check nrof variable *before* calling can_merge()
112	*	191	*
113	* Improvements made with merge: Better checking on potion, and also	192	* Improvements made with merge: Better checking on potion, and also
114	* check weight	193	* check weight
115	*/	194	*/
116		195
117	bool object::can_merge (object *ob1, object *ob2)	196	bool object::can_merge_slow (object *ob1, object *ob2)
118	{	197	{
119	/* A couple quicksanity checks */	198	/* A couple quicksanity checks */
120	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)
121	return 0;	204	return 0;
122		205
123	if (ob1->speed != ob2->speed)	206	//TODO: this ain't working well, use nicer and correct overflow check
124	return 0;
125
126	/* 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
127	* 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
128	* used to store nrof).	209	* used to store nrof).
129	*/	210	*/
130	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
140	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
141		222
142	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
143	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
144		225
145		226	if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
146	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	227	|| ob1->arch != ob2->arch
147	* being locked in inventory should prevent merging.
148	* 0x4 in flags3 is CLIENT_SENT
149	*/
150	if ((ob1->arch != ob2->arch) ||
151	(ob1->flags[0] != ob2->flags[0]) ||
152	(ob1->flags[1] != ob2->flags[1]) ||
153	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
154	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
155	(ob1->name != ob2->name) ||	228	|| ob1->name != ob2->name
156	(ob1->title != ob2->title) ||	229	|| ob1->title != ob2->title
157	(ob1->msg != ob2->msg) ||	230	|| ob1->msg != ob2->msg
158	(ob1->weight != ob2->weight) ||	231	|| ob1->weight != ob2->weight
159	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	232	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
160	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	233	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
161	(ob1->attacktype != ob2->attacktype) ||	234	|| ob1->attacktype != ob2->attacktype
162	(ob1->magic != ob2->magic) ||	235	|| ob1->magic != ob2->magic
163	(ob1->slaying != ob2->slaying) ||	236	|| ob1->slaying != ob2->slaying
164	(ob1->skill != ob2->skill) ||	237	|| ob1->skill != ob2->skill
165	(ob1->value != ob2->value) ||	238	|| ob1->value != ob2->value
166	(ob1->animation_id != ob2->animation_id) ||	239	|| ob1->animation_id != ob2->animation_id
167	(ob1->client_type != ob2->client_type) ||	240	|| ob1->client_type != ob2->client_type
168	(ob1->materialname != ob2->materialname) ||	241	|| ob1->materialname != ob2->materialname
169	(ob1->lore != ob2->lore) ||	242	|| ob1->lore != ob2->lore
170	(ob1->subtype != ob2->subtype) ||	243	|| ob1->subtype != ob2->subtype
171	(ob1->move_type != ob2->move_type) ||	244	|| ob1->move_type != ob2->move_type
172	(ob1->move_block != ob2->move_block) ||	245	|| ob1->move_block != ob2->move_block
173	(ob1->move_allow != ob2->move_allow) ||	246	|| ob1->move_allow != ob2->move_allow
174	(ob1->move_on != ob2->move_on) ||	247	|| ob1->move_on != ob2->move_on
175	(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)
176	return 0;	251	return 0;
177		252
178	/* This is really a spellbook check - really, we should	253	/* This is really a spellbook check - really, we should
179	* check all objects in the inventory.	254	* check all objects in the inventory.
180	*/	255	*/
…		…
183	/* 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 */
184	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	259	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
185	return 0;	260	return 0;
186		261
187	/* Now check to see if the two inventory objects could merge */	262	/* Now check to see if the two inventory objects could merge */
188	if (!CAN_MERGE (ob1->inv, ob2->inv))	263	if (!object::can_merge (ob1->inv, ob2->inv))
189	return 0;	264	return 0;
190		265
191	/* 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
192	* if it is valid.	267	* if it is valid.
193	*/	268	*/
…		…
254	{	329	{
255	if (inv->inv)	330	if (inv->inv)
256	sum_weight (inv);	331	sum_weight (inv);
257	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	332	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
258	}	333	}
		334
259	if (op->type == CONTAINER && op->stats.Str)	335	if (op->type == CONTAINER && op->stats.Str)
260	sum = (sum * (100 - op->stats.Str)) / 100;	336	sum = (sum * (100 - op->stats.Str)) / 100;
		337
261	if (op->carrying != sum)	338	if (op->carrying != sum)
262	op->carrying = sum;	339	op->carrying = sum;
		340
263	return sum;	341	return sum;
264	}	342	}
265		343
266	/**	344	/**
267	* Return the outermost environment object for a given object.	345	* Return the outermost environment object for a given object.
…		…
274	op = op->env;	352	op = op->env;
275	return op;	353	return op;
276	}	354	}
277		355
278	/*	356	/*
279	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
280	* a better check. We basically keeping traversing up until we can't
281	* or find a player.
282	*/
283
284	object *
285	is_player_inv (object *op)
286	{
287	for (; op != NULL && op->type != PLAYER; op = op->env)
288	if (op->env == op)
289	op->env = NULL;
290	return op;
291	}
292
293	/*
294	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
295	* Some error messages.	358	* Some error messages.
296	* The result of the dump is stored in the static global errmsg array.	359	* The result of the dump is stored in the static global errmsg array.
297	*/	360	*/
298		361
299	void	362	char *
300	dump_object2 (object *op)
301	{
302	errmsg[0] = 0;
303	return;
304	//TODO//D#d#
305	#if 0
306	char *cp;
307
308	/* object *tmp;*/
309
310	if (op->arch != NULL)
311	{
312	strcat (errmsg, "arch ");
313	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
314	strcat (errmsg, "\n");
315	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
316	strcat (errmsg, cp);
317	# if 0
318	/* Don't dump player diffs - they are too long, mostly meaningless, and
319	* will overflow the buffer.
320	* Changed so that we don't dump inventory either. This may
321	* also overflow the buffer.
322	*/
323	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
324	strcat (errmsg, cp);
325	for (tmp = op->inv; tmp; tmp = tmp->below)
326	dump_object2 (tmp);
327	# endif
328	strcat (errmsg, "end\n");
329	}
330	else
331	{
332	strcat (errmsg, "Object ");
333	if (op->name == NULL)
334	strcat (errmsg, "(null)");
335	else
336	strcat (errmsg, op->name);
337	strcat (errmsg, "\n");
338	# if 0
339	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
340	strcat (errmsg, cp);
341	for (tmp = op->inv; tmp; tmp = tmp->below)
342	dump_object2 (tmp);
343	# endif
344	strcat (errmsg, "end\n");
345	}
346	#endif
347	}
348
349	/*
350	* Dumps an object. Returns output in the static global errmsg array.
351	*/
352
353	void
354	dump_object (object *op)	363	dump_object (object *op)
355	{	364	{
356	if (op == NULL)	365	if (!op)
357	{	366	return strdup ("[NULLOBJ]");
358	strcpy (errmsg, "[NULL pointer]");
359	return;
360	}
361	errmsg[0] = '\0';
362	dump_object2 (op);
363	}
364		367
365	void	368	object_freezer freezer;
366	dump_all_objects (void)	369	save_object (freezer, op, 3);
367	{	370	return freezer.as_string ();
368	object *op;
369
370	for (op = objects; op != NULL; op = op->next)
371	{
372	dump_object (op);
373	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
374	}
375	}	371	}
376		372
377	/*	373	/*
378	* get_nearest_part(multi-object, object 2) returns the part of the	374	* get_nearest_part(multi-object, object 2) returns the part of the
379	* multi-object 1 which is closest to the second object.	375	* multi-object 1 which is closest to the second object.
…		…
399	*/	395	*/
400		396
401	object *	397	object *
402	find_object (tag_t i)	398	find_object (tag_t i)
403	{	399	{
404	object *op;	400	for (object *op = object::first; op; op = op->next)
405
406	for (op = objects; op != NULL; op = op->next)
407	if (op->count == i)	401	if (op->count == i)
408	break;	402	return op;
		403
409	return op;	404	return 0;
410	}	405	}
411		406
412	/*	407	/*
413	* 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.
414	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
…		…
416	*/	411	*/
417		412
418	object *	413	object *
419	find_object_name (const char *str)	414	find_object_name (const char *str)
420	{	415	{
421	const char *name = shstr::find (str);	416	shstr_cmp str_ (str);
422	object *op;	417	object *op;
423		418
424	for (op = objects; op != NULL; op = op->next)	419	for (op = object::first; op != NULL; op = op->next)
425	if (&op->name == name)	420	if (op->name == str_)
426	break;	421	break;
427		422
428	return op;	423	return op;
429	}	424	}
430		425
431	void	426	void
432	free_all_object_data ()	427	free_all_object_data ()
433	{	428	{
434	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	429	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
435	}
436
437	/*
438	* Returns the object which this object marks as being the owner.
439	* A id-scheme is used to avoid pointing to objects which have been
440	* freed and are now reused. If this is detected, the owner is
441	* set to NULL, and NULL is returned.
442	* Changed 2004-02-12 - if the player is setting at the play again
443	* prompt, he is removed, and we don't want to treat him as an owner of
444	* anything, so check removed flag. I don't expect that this should break
445	* anything - once an object is removed, it is basically dead anyways.
446	*/
447	object *
448	object::get_owner ()
449	{
450	if (!owner
451	|| QUERY_FLAG (owner, FLAG_FREED)
452	|| QUERY_FLAG (owner, FLAG_REMOVED))
453	owner = 0;
454
455	return owner;
456	}	430	}
457		431
458	/*	432	/*
459	* Sets the owner and sets the skill and exp pointers to owner's current	433	* Sets the owner and sets the skill and exp pointers to owner's current
460	* skill and experience objects.	434	* skill and experience objects.
…		…
530		504
531	/* What is not cleared is next, prev, and count */	505	/* What is not cleared is next, prev, and count */
532		506
533	expmul = 1.0;	507	expmul = 1.0;
534	face = blank_face;	508	face = blank_face;
535	attacked_by_count = -1;
536		509
537	if (settings.casting_time)	510	if (settings.casting_time)
538	casting_time = -1;	511	casting_time = -1;
539	}	512	}
540		513
541	void object::clone (object *destination)
542	{
543	*(object_copy *)destination = *this;
544	*(object_pod *)destination = *this;
545
546	if (self || cb)
547	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
548	}
549
550	/*	514	/*
551	* copy object first frees everything allocated by the second object,	515	* copy_to first frees everything allocated by the dst object,
552	* and then copies the contends of the first object into the second	516	* and then copies the contents of itself into the second
553	* object, allocating what needs to be allocated. Basically, any	517	* object, allocating what needs to be allocated. Basically, any
554	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	518	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
555	* if the first object is freed, the pointers in the new object	519	* if the first object is freed, the pointers in the new object
556	* will point at garbage.	520	* will point at garbage.
557	*/	521	*/
558	void	522	void
559	copy_object (object *op2, object *op)	523	object::copy_to (object *dst)
560	{	524	{
561	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	525	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
562	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	526	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
563		527
564	op2->clone (op);	528	*(object_copy *)dst = *this;
		529	*(object_pod *)dst = *this;
		530
		531	if (self || cb)
		532	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
565		533
566	if (is_freed)	534	if (is_freed)
567	SET_FLAG (op, FLAG_FREED);	535	SET_FLAG (dst, FLAG_FREED);
		536
568	if (is_removed)	537	if (is_removed)
569	SET_FLAG (op, FLAG_REMOVED);	538	SET_FLAG (dst, FLAG_REMOVED);
570		539
571	if (op2->speed < 0)	540	if (speed < 0)
572	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	541	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
573		542
574	/* Copy over key_values, if any. */	543	/* Copy over key_values, if any. */
575	if (op2->key_values)	544	if (key_values)
576	{	545	{
577	key_value *tail = 0;	546	key_value *tail = 0;
578	key_value *i;	547	key_value *i;
579		548
580	op->key_values = 0;	549	dst->key_values = 0;
581		550
582	for (i = op2->key_values; i; i = i->next)	551	for (i = key_values; i; i = i->next)
583	{	552	{
584	key_value *new_link = new key_value;	553	key_value *new_link = new key_value;
585		554
586	new_link->next = 0;	555	new_link->next = 0;
587	new_link->key = i->key;	556	new_link->key = i->key;
588	new_link->value = i->value;	557	new_link->value = i->value;
589		558
590	/* Try and be clever here, too. */	559	/* Try and be clever here, too. */
591	if (!op->key_values)	560	if (!dst->key_values)
592	{	561	{
593	op->key_values = new_link;	562	dst->key_values = new_link;
594	tail = new_link;	563	tail = new_link;
595	}	564	}
596	else	565	else
597	{	566	{
598	tail->next = new_link;	567	tail->next = new_link;
599	tail = new_link;	568	tail = new_link;
600	}	569	}
601	}	570	}
602	}	571	}
603		572
604	update_ob_speed (op);	573	update_ob_speed (dst);
		574	}
		575
		576	object *
		577	object::clone ()
		578	{
		579	object *neu = create ();
		580	copy_to (neu);
		581	return neu;
605	}	582	}
606		583
607	/*	584	/*
608	* If an object with the IS_TURNABLE() flag needs to be turned due	585	* If an object with the IS_TURNABLE() flag needs to be turned due
609	* to the closest player being on the other side, this function can	586	* to the closest player being on the other side, this function can
…		…
814	update_now = 1;	791	update_now = 1;
815		792
816	if ((move_slow | op->move_slow) != move_slow)	793	if ((move_slow | op->move_slow) != move_slow)
817	update_now = 1;	794	update_now = 1;
818	}	795	}
		796
819	/* if the object is being removed, we can't make intelligent	797	/* if the object is being removed, we can't make intelligent
820	* decisions, because remove_ob can't really pass the object	798	* decisions, because remove_ob can't really pass the object
821	* that is being removed.	799	* that is being removed.
822	*/	800	*/
823	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	801	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
…		…
835		813
836	if (op->more != NULL)	814	if (op->more != NULL)
837	update_object (op->more, action);	815	update_object (op->more, action);
838	}	816	}
839		817
840	static unordered_vector<object *> mortals;	818	object::vector object::mortals;
841	static std::vector<object *> freed;	819	object::vector object::objects; // not yet used
		820	object *object::first;
842		821
843	void object::free_mortals ()	822	void object::free_mortals ()
844	{	823	{
845	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	824	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
846	if ((*i)->refcnt)	825	if ((*i)->refcnt)
847	++i; // further delay freeing	826	++i; // further delay freeing
848	else	827	else
849	{	828	{
850	freed.push_back (*i);//D
851	//delete *i;	829	delete *i;
852	mortals.erase (i);	830	mortals.erase (i);
853	}	831	}
854
855	if (mortals.size())//D
856	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
857	}	832	}
858		833
859	object::object ()	834	object::object ()
860	{	835	{
861	SET_FLAG (this, FLAG_REMOVED);	836	SET_FLAG (this, FLAG_REMOVED);
862		837
863	expmul = 1.0;	838	expmul = 1.0;
864	face = blank_face;	839	face = blank_face;
865	attacked_by_count = -1;
866	}	840	}
867		841
868	object::~object ()	842	object::~object ()
869	{	843	{
870	free_key_values (this);	844	free_key_values (this);
871	}	845	}
872		846
873	void object::link ()	847	void object::link ()
874	{	848	{
875	count = ++ob_count;	849	count = ++ob_count;
		850	uuid = gen_uuid ();
876		851
877	prev = 0;	852	prev = 0;
878	next = objects;	853	next = object::first;
879		854
880	if (objects)	855	if (object::first)
881	objects->prev = this;	856	object::first->prev = this;
882		857
883	objects = this;	858	object::first = this;
884	}	859	}
885		860
886	void object::unlink ()	861	void object::unlink ()
887	{	862	{
888	count = 0;	863	if (this == object::first)
		864	object::first = next;
889		865
890	/* Remove this object from the list of used objects */	866	/* Remove this object from the list of used objects */
891	if (prev)
892	{
893	prev->next = next;	867	if (prev) prev->next = next;
		868	if (next) next->prev = prev;
		869
894	prev = 0;	870	prev = 0;
895	}
896
897	if (next)
898	{
899	next->prev = prev;
900	next = 0;	871	next = 0;
901	}
902
903	if (this == objects)
904	objects = next;
905	}	872	}
906		873
907	object *object::create ()	874	object *object::create ()
908	{	875	{
909	object *op;
910
911	if (freed.empty ())
912	op = new object;	876	object *op = new object;
913	else
914	{
915	// highly annoying, but the only way to get it stable right now
916	op = freed.back ();
917	freed.pop_back ();
918	op->~object ();
919	new ((void *) op) object;
920	}
921
922	op->link ();	877	op->link ();
923	return op;	878	return op;
924	}	879	}
925		880
926	/*	881	/*
…		…
928	* it from the list of used objects, and puts it on the list of	883	* it from the list of used objects, and puts it on the list of
929	* free objects. The IS_FREED() flag is set in the object.	884	* free objects. The IS_FREED() flag is set in the object.
930	* The object must have been removed by remove_ob() first for	885	* The object must have been removed by remove_ob() first for
931	* this function to succeed.	886	* this function to succeed.
932	*	887	*
933	* If free_inventory is set, free inventory as well. Else drop items in	888	* If destroy_inventory is set, free inventory as well. Else drop items in
934	* inventory to the ground.	889	* inventory to the ground.
935	*/	890	*/
936	void object::free (bool free_inventory)	891	void object::destroy (bool destroy_inventory)
937	{	892	{
938	if (QUERY_FLAG (this, FLAG_FREED))	893	if (QUERY_FLAG (this, FLAG_FREED))
939	return;	894	return;
940		895
941	if (QUERY_FLAG (this, FLAG_FRIENDLY))	896	if (QUERY_FLAG (this, FLAG_FRIENDLY))
942	remove_friendly_object (this);	897	remove_friendly_object (this);
943		898
944	if (!QUERY_FLAG (this, FLAG_REMOVED))	899	if (!QUERY_FLAG (this, FLAG_REMOVED))
945	remove_ob (this);	900	remove ();
946		901
947	SET_FLAG (this, FLAG_FREED);	902	SET_FLAG (this, FLAG_FREED);
948		903
949	if (more)	904	if (more)
950	{	905	{
951	more->free (free_inventory);	906	more->destroy (destroy_inventory);
952	more = 0;	907	more = 0;
953	}	908	}
954		909
955	if (inv)	910	if (inv)
956	{	911	{
957	/* Only if the space blocks everything do we not process -	912	/* Only if the space blocks everything do we not process -
958	* if some form of movement is allowed, let objects	913	* if some form of movement is allowed, let objects
959	* drop on that space.	914	* drop on that space.
960	*/	915	*/
961	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)	916	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
962	{	917	{
963	object *op = inv;	918	object *op = inv;
964		919
965	while (op)	920	while (op)
966	{	921	{
967	object *tmp = op->below;	922	object *tmp = op->below;
968	op->free (free_inventory);	923	op->destroy (destroy_inventory);
969	op = tmp;	924	op = tmp;
970	}	925	}
971	}	926	}
972	else	927	else
973	{ /* Put objects in inventory onto this space */	928	{ /* Put objects in inventory onto this space */
…		…
975		930
976	while (op)	931	while (op)
977	{	932	{
978	object *tmp = op->below;	933	object *tmp = op->below;
979		934
980	remove_ob (op);	935	op->remove ();
981		936
982	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	937	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
983	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	938	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
984	free_object (op);	939	op->destroy ();
985	else	940	else
986	{	941	{
987	op->x = x;	942	op->x = x;
988	op->y = y;	943	op->y = y;
989	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	944	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
992	op = tmp;	947	op = tmp;
993	}	948	}
994	}	949	}
995	}	950	}
996		951
		952	// hack to ensure that freed objects still have a valid map
		953	{
		954	static maptile *freed_map; // freed objects are moved here to avoid crashes
		955
		956	if (!freed_map)
		957	{
		958	freed_map = new maptile;
		959
		960	freed_map->name = "/internal/freed_objects_map";
		961	freed_map->width = 3;
		962	freed_map->height = 3;
		963
		964	freed_map->allocate ();
		965	}
		966
		967	map = freed_map;
		968	x = 1;
		969	y = 1;
		970	}
		971
		972	// clear those pointers that likely might have circular references to us
997	owner = 0;	973	owner = 0;
		974	enemy = 0;
		975	attacked_by = 0;
		976
		977	// only relevant for players(?), but make sure of it anyways
		978	contr = 0;
998		979
999	/* Remove object from the active list */	980	/* Remove object from the active list */
1000	speed = 0;	981	speed = 0;
1001	update_ob_speed (this);	982	update_ob_speed (this);
1002		983
…		…
1007		988
1008	/*	989	/*
1009	* sub_weight() recursively (outwards) subtracts a number from the	990	* sub_weight() recursively (outwards) subtracts a number from the
1010	* weight of an object (and what is carried by it's environment(s)).	991	* weight of an object (and what is carried by it's environment(s)).
1011	*/	992	*/
1012
1013	void	993	void
1014	sub_weight (object *op, signed long weight)	994	sub_weight (object *op, signed long weight)
1015	{	995	{
1016	while (op != NULL)	996	while (op != NULL)
1017	{	997	{
1018	if (op->type == CONTAINER)	998	if (op->type == CONTAINER)
1019	{
1020	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	999	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1021	}	1000
1022	op->carrying -= weight;	1001	op->carrying -= weight;
1023	op = op->env;	1002	op = op->env;
1024	}	1003	}
1025	}	1004	}
1026		1005
1027	/* remove_ob(op):	1006	/* op->remove ():
1028	* This function removes the object op from the linked list of objects	1007	* This function removes the object op from the linked list of objects
1029	* which it is currently tied to. When this function is done, the	1008	* which it is currently tied to. When this function is done, the
1030	* object will have no environment. If the object previously had an	1009	* object will have no environment. If the object previously had an
1031	* environment, the x and y coordinates will be updated to	1010	* environment, the x and y coordinates will be updated to
1032	* the previous environment.	1011	* the previous environment.
1033	* Beware: This function is called from the editor as well!	1012	* Beware: This function is called from the editor as well!
1034	*/	1013	*/
1035
1036	void	1014	void
1037	remove_ob (object *op)	1015	object::remove ()
1038	{	1016	{
		1017	object *tmp, *last = 0;
1039	object *	1018	object *otmp;
1040	tmp, *
1041	last = NULL;
1042	object *
1043	otmp;
1044		1019
1045	tag_t
1046	tag;
1047	int
1048	check_walk_off;	1020	int check_walk_off;
1049	mapstruct *
1050	m;
1051		1021
1052	sint16
1053	x,
1054	y;
1055
1056	if (QUERY_FLAG (op, FLAG_REMOVED))	1022	if (QUERY_FLAG (this, FLAG_REMOVED))
1057	return;	1023	return;
1058		1024
1059	SET_FLAG (op, FLAG_REMOVED);	1025	SET_FLAG (this, FLAG_REMOVED);
1060		1026
1061	if (op->more != NULL)	1027	if (more)
1062	remove_ob (op->more);	1028	more->remove ();
1063		1029
1064	/*	1030	/*
1065	* In this case, the object to be removed is in someones	1031	* In this case, the object to be removed is in someones
1066	* inventory.	1032	* inventory.
1067	*/	1033	*/
1068	if (op->env != NULL)	1034	if (env)
1069	{	1035	{
1070	if (op->nrof)	1036	if (nrof)
1071	sub_weight (op->env, op->weight * op->nrof);	1037	sub_weight (env, weight * nrof);
1072	else	1038	else
1073	sub_weight (op->env, op->weight + op->carrying);	1039	sub_weight (env, weight + carrying);
1074		1040
1075	/* NO_FIX_PLAYER is set when a great many changes are being	1041	/* NO_FIX_PLAYER is set when a great many changes are being
1076	* made to players inventory. If set, avoiding the call	1042	* made to players inventory. If set, avoiding the call
1077	* to save cpu time.	1043	* to save cpu time.
1078	*/	1044	*/
1079	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1045	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1080	fix_player (otmp);	1046	fix_player (otmp);
1081		1047
1082	if (op->above != NULL)	1048	if (above != NULL)
1083	op->above->below = op->below;	1049	above->below = below;
1084	else	1050	else
1085	op->env->inv = op->below;	1051	env->inv = below;
1086		1052
1087	if (op->below != NULL)	1053	if (below != NULL)
1088	op->below->above = op->above;	1054	below->above = above;
1089		1055
1090	/* we set up values so that it could be inserted into	1056	/* we set up values so that it could be inserted into
1091	* the map, but we don't actually do that - it is up	1057	* the map, but we don't actually do that - it is up
1092	* to the caller to decide what we want to do.	1058	* to the caller to decide what we want to do.
1093	*/	1059	*/
1094	op->x = op->env->x, op->y = op->env->y;	1060	x = env->x, y = env->y;
1095	op->map = op->env->map;	1061	map = env->map;
1096	op->above = NULL, op->below = NULL;	1062	above = 0, below = 0;
1097	op->env = NULL;	1063	env = 0;
1098	}	1064	}
1099	else if (op->map)	1065	else if (map)
1100	{	1066	{
1101	x = op->x;
1102	y = op->y;
1103	m = get_map_from_coord (op->map, &x, &y);
1104
1105	if (!m)
1106	{
1107	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1108	op->map->path, op->x, op->y);
1109	/* in old days, we used to set x and y to 0 and continue.
1110	* it seems if we get into this case, something is probablye
1111	* screwed up and should be fixed.
1112	*/
1113	abort ();
1114	}
1115
1116	if (op->map != m)
1117	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1118	op->map->path, m->path, op->x, op->y, x, y);
1119
1120	/* Re did the following section of code - it looks like it had	1067	/* Re did the following section of code - it looks like it had
1121	* lots of logic for things we no longer care about	1068	* lots of logic for things we no longer care about
1122	*/	1069	*/
1123		1070
1124	/* link the object above us */	1071	/* link the object above us */
1125	if (op->above)	1072	if (above)
1126	op->above->below = op->below;	1073	above->below = below;
1127	else	1074	else
1128	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1075	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1129		1076
1130	/* Relink the object below us, if there is one */	1077	/* Relink the object below us, if there is one */
1131	if (op->below)	1078	if (below)
1132	op->below->above = op->above;	1079	below->above = above;
1133	else	1080	else
1134	{	1081	{
1135	/* Nothing below, which means we need to relink map object for this space	1082	/* Nothing below, which means we need to relink map object for this space
1136	* use translated coordinates in case some oddness with map tiling is	1083	* use translated coordinates in case some oddness with map tiling is
1137	* evident	1084	* evident
1138	*/	1085	*/
1139	if (GET_MAP_OB (m, x, y) != op)	1086	if (GET_MAP_OB (map, x, y) != this)
1140	{	1087	{
1141	dump_object (op);	1088	char *dump = dump_object (this);
1142	LOG (llevError,	1089	LOG (llevError,
1143	"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);	1090	"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);
		1091	free (dump);
1144	dump_object (GET_MAP_OB (m, x, y));	1092	dump = dump_object (GET_MAP_OB (map, x, y));
1145	LOG (llevError, "%s\n", errmsg);	1093	LOG (llevError, "%s\n", dump);
		1094	free (dump);
1146	}	1095	}
1147		1096
1148	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1097	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1149	}	1098	}
1150		1099
1151	op->above = 0;	1100	above = 0;
1152	op->below = 0;	1101	below = 0;
1153		1102
1154	if (op->map->in_memory == MAP_SAVING)	1103	if (map->in_memory == MAP_SAVING)
1155	return;	1104	return;
1156		1105
1157	tag = op->count;
1158	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1106	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1159		1107
1160	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1108	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1161	{	1109	{
1162	/* No point updating the players look faces if he is the object	1110	/* No point updating the players look faces if he is the object
1163	* being removed.	1111	* being removed.
1164	*/	1112	*/
1165		1113
1166	if (tmp->type == PLAYER && tmp != op)	1114	if (tmp->type == PLAYER && tmp != this)
1167	{	1115	{
1168	/* If a container that the player is currently using somehow gets	1116	/* If a container that the player is currently using somehow gets
1169	* removed (most likely destroyed), update the player view	1117	* removed (most likely destroyed), update the player view
1170	* appropriately.	1118	* appropriately.
1171	*/	1119	*/
1172	if (tmp->container == op)	1120	if (tmp->container == this)
1173	{	1121	{
1174	CLEAR_FLAG (op, FLAG_APPLIED);	1122	CLEAR_FLAG (this, FLAG_APPLIED);
1175	tmp->container = NULL;	1123	tmp->container = 0;
1176	}	1124	}
1177		1125
1178	tmp->contr->socket.update_look = 1;	1126	tmp->contr->socket->floorbox_update ();
1179	}	1127	}
1180		1128
1181	/* See if player moving off should effect something */	1129	/* See if player moving off should effect something */
1182	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1130	if (check_walk_off
		1131	&& ((move_type & tmp->move_off)
		1132	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1183	{	1133	{
1184	move_apply (tmp, op, NULL);	1134	move_apply (tmp, this, 0);
1185		1135
1186	if (was_destroyed (op, tag))	1136	if (destroyed ())
1187	{
1188	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1137	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1189	}
1190	}	1138	}
1191		1139
1192	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1140	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1193		1141
1194	if (tmp->above == tmp)	1142	if (tmp->above == tmp)
1195	tmp->above = NULL;	1143	tmp->above = 0;
1196		1144
1197	last = tmp;	1145	last = tmp;
1198	}	1146	}
1199		1147
1200	/* last == NULL of there are no objects on this space */	1148	/* last == NULL of there are no objects on this space */
1201	if (last == NULL)	1149	if (!last)
1202	{	1150	{
1203	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1151	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1204	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1152	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1205	* those out anyways, and if there are any flags set right now, they won't	1153	* those out anyways, and if there are any flags set right now, they won't
1206	* be correct anyways.	1154	* be correct anyways.
1207	*/	1155	*/
1208	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1156	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1209	update_position (op->map, op->x, op->y);	1157	update_position (map, x, y);
1210	}	1158	}
1211	else	1159	else
1212	update_object (last, UP_OBJ_REMOVE);	1160	update_object (last, UP_OBJ_REMOVE);
1213		1161
1214	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1162	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1215	update_all_los (op->map, op->x, op->y);	1163	update_all_los (map, x, y);
1216	}	1164	}
1217	}	1165	}
1218		1166
1219	/*	1167	/*
1220	* merge_ob(op,top):	1168	* merge_ob(op,top):
…		…
1222	* This function goes through all objects below and including top, and	1170	* This function goes through all objects below and including top, and
1223	* merges op to the first matching object.	1171	* merges op to the first matching object.
1224	* If top is NULL, it is calculated.	1172	* If top is NULL, it is calculated.
1225	* Returns pointer to object if it succeded in the merge, otherwise NULL	1173	* Returns pointer to object if it succeded in the merge, otherwise NULL
1226	*/	1174	*/
1227
1228	object *	1175	object *
1229	merge_ob (object *op, object *top)	1176	merge_ob (object *op, object *top)
1230	{	1177	{
1231	if (!op->nrof)	1178	if (!op->nrof)
1232	return 0;	1179	return 0;
…		…
1236		1183
1237	for (; top != NULL; top = top->below)	1184	for (; top != NULL; top = top->below)
1238	{	1185	{
1239	if (top == op)	1186	if (top == op)
1240	continue;	1187	continue;
1241	if (CAN_MERGE (op, top))	1188
		1189	if (object::can_merge (op, top))
1242	{	1190	{
1243	top->nrof += op->nrof;	1191	top->nrof += op->nrof;
1244		1192
1245	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1193	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1246	op->weight = 0; /* Don't want any adjustements now */	1194	op->weight = 0; /* Don't want any adjustements now */
1247	remove_ob (op);	1195	op->destroy ();
1248	free_object (op);
1249	return top;	1196	return top;
1250	}	1197	}
1251	}	1198	}
1252		1199
1253	return NULL;	1200	return 0;
1254	}	1201	}
1255		1202
1256	/*	1203	/*
1257	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1204	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1258	* job preparing multi-part monsters	1205	* job preparing multi-part monsters
1259	*/	1206	*/
1260	object *	1207	object *
1261	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1208	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1262	{	1209	{
1263	object *tmp;	1210	object *tmp;
1264		1211
1265	if (op->head)	1212	if (op->head)
1266	op = op->head;	1213	op = op->head;
…		…
1294	* NULL if 'op' was destroyed	1241	* NULL if 'op' was destroyed
1295	* just 'op' otherwise	1242	* just 'op' otherwise
1296	*/	1243	*/
1297		1244
1298	object *	1245	object *
1299	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1246	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1300	{	1247	{
1301	object *tmp, *top, *floor = NULL;	1248	object *tmp, *top, *floor = NULL;
1302	sint16 x, y;	1249	sint16 x, y;
1303		1250
1304	if (QUERY_FLAG (op, FLAG_FREED))	1251	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1307	return NULL;	1254	return NULL;
1308	}	1255	}
1309		1256
1310	if (m == NULL)	1257	if (m == NULL)
1311	{	1258	{
1312	dump_object (op);	1259	char *dump = dump_object (op);
1313	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1260	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1261	free (dump);
1314	return op;	1262	return op;
1315	}	1263	}
1316		1264
1317	if (out_of_map (m, op->x, op->y))	1265	if (out_of_map (m, op->x, op->y))
1318	{	1266	{
1319	dump_object (op);	1267	char *dump = dump_object (op);
1320	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1268	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1321	#ifdef MANY_CORES	1269	#ifdef MANY_CORES
1322	/* Better to catch this here, as otherwise the next use of this object	1270	/* Better to catch this here, as otherwise the next use of this object
1323	* is likely to cause a crash. Better to find out where it is getting	1271	* is likely to cause a crash. Better to find out where it is getting
1324	* improperly inserted.	1272	* improperly inserted.
1325	*/	1273	*/
1326	abort ();	1274	abort ();
1327	#endif	1275	#endif
		1276	free (dump);
1328	return op;	1277	return op;
1329	}	1278	}
1330		1279
1331	if (!QUERY_FLAG (op, FLAG_REMOVED))	1280	if (!QUERY_FLAG (op, FLAG_REMOVED))
1332	{	1281	{
1333	dump_object (op);	1282	char *dump = dump_object (op);
1334	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1283	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1284	free (dump);
1335	return op;	1285	return op;
1336	}	1286	}
1337		1287
1338	if (op->more != NULL)	1288	if (op->more != NULL)
1339	{	1289	{
…		…
1377		1327
1378	/* this has to be done after we translate the coordinates.	1328	/* this has to be done after we translate the coordinates.
1379	*/	1329	*/
1380	if (op->nrof && !(flag & INS_NO_MERGE))	1330	if (op->nrof && !(flag & INS_NO_MERGE))
1381	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1331	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1382	if (CAN_MERGE (op, tmp))	1332	if (object::can_merge (op, tmp))
1383	{	1333	{
1384	op->nrof += tmp->nrof;	1334	op->nrof += tmp->nrof;
1385	remove_ob (tmp);	1335	tmp->destroy ();
1386	free_object (tmp);
1387	}	1336	}
1388		1337
1389	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1338	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1390	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1339	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1391		1340
…		…
1519	* it, so save a few ticks and start from there.	1468	* it, so save a few ticks and start from there.
1520	*/	1469	*/
1521	if (!(flag & INS_MAP_LOAD))	1470	if (!(flag & INS_MAP_LOAD))
1522	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1471	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1523	if (tmp->type == PLAYER)	1472	if (tmp->type == PLAYER)
1524	tmp->contr->socket.update_look = 1;	1473	tmp->contr->socket->floorbox_update ();
1525		1474
1526	/* If this object glows, it may affect lighting conditions that are	1475	/* If this object glows, it may affect lighting conditions that are
1527	* visible to others on this map. But update_all_los is really	1476	* visible to others on this map. But update_all_los is really
1528	* an inefficient way to do this, as it means los for all players	1477	* an inefficient way to do this, as it means los for all players
1529	* on the map will get recalculated. The players could very well	1478	* on the map will get recalculated. The players could very well
…		…
1537		1486
1538	/* updates flags (blocked, alive, no magic, etc) for this map space */	1487	/* updates flags (blocked, alive, no magic, etc) for this map space */
1539	update_object (op, UP_OBJ_INSERT);	1488	update_object (op, UP_OBJ_INSERT);
1540		1489
1541	/* Don't know if moving this to the end will break anything. However,	1490	/* Don't know if moving this to the end will break anything. However,
1542	* we want to have update_look set above before calling this.	1491	* we want to have floorbox_update called before calling this.
1543	*	1492	*
1544	* check_move_on() must be after this because code called from	1493	* check_move_on() must be after this because code called from
1545	* check_move_on() depends on correct map flags (so functions like	1494	* check_move_on() depends on correct map flags (so functions like
1546	* blocked() and wall() work properly), and these flags are updated by	1495	* blocked() and wall() work properly), and these flags are updated by
1547	* update_object().	1496	* update_object().
…		…
1577	tmp1;	1526	tmp1;
1578		1527
1579	/* first search for itself and remove any old instances */	1528	/* first search for itself and remove any old instances */
1580		1529
1581	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1530	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1582	{
1583	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1531	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1584	{	1532	tmp->destroy ();
1585	remove_ob (tmp);
1586	free_object (tmp);
1587	}
1588	}
1589		1533
1590	tmp1 = arch_to_object (find_archetype (arch_string));	1534	tmp1 = arch_to_object (archetype::find (arch_string));
1591		1535
1592	tmp1->x = op->x;	1536	tmp1->x = op->x;
1593	tmp1->y = op->y;	1537	tmp1->y = op->y;
1594	insert_ob_in_map (tmp1, op->map, op, 0);	1538	insert_ob_in_map (tmp1, op->map, op, 0);
1595	}	1539	}
…		…
1603	*/	1547	*/
1604		1548
1605	object *	1549	object *
1606	get_split_ob (object *orig_ob, uint32 nr)	1550	get_split_ob (object *orig_ob, uint32 nr)
1607	{	1551	{
1608	object *	1552	object *newob;
1609	newob;
1610	int
1611	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1553	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1612		1554
1613	if (orig_ob->nrof < nr)	1555	if (orig_ob->nrof < nr)
1614	{	1556	{
1615	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1557	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1616	return NULL;	1558	return NULL;
1617	}	1559	}
1618		1560
1619	newob = object_create_clone (orig_ob);	1561	newob = object_create_clone (orig_ob);
1620		1562
1621	if ((orig_ob->nrof -= nr) < 1)	1563	if ((orig_ob->nrof -= nr) < 1)
1622	{	1564	orig_ob->destroy (1);
1623	if (!is_removed)
1624	remove_ob (orig_ob);
1625	free_object2 (orig_ob, 1);
1626	}
1627	else if (!is_removed)	1565	else if (!is_removed)
1628	{	1566	{
1629	if (orig_ob->env != NULL)	1567	if (orig_ob->env != NULL)
1630	sub_weight (orig_ob->env, orig_ob->weight * nr);	1568	sub_weight (orig_ob->env, orig_ob->weight * nr);
1631	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1569	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1661	if (i > op->nrof)	1599	if (i > op->nrof)
1662	i = op->nrof;	1600	i = op->nrof;
1663		1601
1664	if (QUERY_FLAG (op, FLAG_REMOVED))	1602	if (QUERY_FLAG (op, FLAG_REMOVED))
1665	op->nrof -= i;	1603	op->nrof -= i;
1666	else if (op->env != NULL)	1604	else if (op->env)
1667	{	1605	{
1668	/* is this object in the players inventory, or sub container	1606	/* is this object in the players inventory, or sub container
1669	* therein?	1607	* therein?
1670	*/	1608	*/
1671	tmp = is_player_inv (op->env);	1609	tmp = op->in_player ();
1672	/* nope. Is this a container the player has opened?	1610	/* nope. Is this a container the player has opened?
1673	* If so, set tmp to that player.	1611	* If so, set tmp to that player.
1674	* IMO, searching through all the players will mostly	1612	* IMO, searching through all the players will mostly
1675	* likely be quicker than following op->env to the map,	1613	* likely be quicker than following op->env to the map,
1676	* and then searching the map for a player.	1614	* and then searching the map for a player.
1677	*/	1615	*/
1678	if (!tmp)	1616	if (!tmp)
1679	{	1617	{
1680	for (pl = first_player; pl; pl = pl->next)	1618	for (pl = first_player; pl; pl = pl->next)
1681	if (pl->ob->container == op->env)	1619	if (pl->ob->container == op->env)
		1620	{
		1621	tmp = pl->ob;
1682	break;	1622	break;
1683	if (pl)	1623	}
1684	tmp = pl->ob;
1685	else
1686	tmp = NULL;
1687	}	1624	}
1688		1625
1689	if (i < op->nrof)	1626	if (i < op->nrof)
1690	{	1627	{
1691	sub_weight (op->env, op->weight * i);	1628	sub_weight (op->env, op->weight * i);
1692	op->nrof -= i;	1629	op->nrof -= i;
1693	if (tmp)	1630	if (tmp)
1694	{
1695	esrv_send_item (tmp, op);	1631	esrv_send_item (tmp, op);
1696	}
1697	}	1632	}
1698	else	1633	else
1699	{	1634	{
1700	remove_ob (op);	1635	op->remove ();
1701	op->nrof = 0;	1636	op->nrof = 0;
1702	if (tmp)	1637	if (tmp)
1703	{
1704	esrv_del_item (tmp->contr, op->count);	1638	esrv_del_item (tmp->contr, op->count);
1705	}
1706	}	1639	}
1707	}	1640	}
1708	else	1641	else
1709	{	1642	{
1710	object *above = op->above;	1643	object *above = op->above;
1711		1644
1712	if (i < op->nrof)	1645	if (i < op->nrof)
1713	op->nrof -= i;	1646	op->nrof -= i;
1714	else	1647	else
1715	{	1648	{
1716	remove_ob (op);	1649	op->remove ();
1717	op->nrof = 0;	1650	op->nrof = 0;
1718	}	1651	}
1719		1652
1720	/* Since we just removed op, op->above is null */	1653	/* Since we just removed op, op->above is null */
1721	for (tmp = above; tmp != NULL; tmp = tmp->above)	1654	for (tmp = above; tmp; tmp = tmp->above)
1722	if (tmp->type == PLAYER)	1655	if (tmp->type == PLAYER)
1723	{	1656	{
1724	if (op->nrof)	1657	if (op->nrof)
1725	esrv_send_item (tmp, op);	1658	esrv_send_item (tmp, op);
1726	else	1659	else
…		…
1730		1663
1731	if (op->nrof)	1664	if (op->nrof)
1732	return op;	1665	return op;
1733	else	1666	else
1734	{	1667	{
1735	free_object (op);	1668	op->destroy ();
1736	return NULL;	1669	return 0;
1737	}	1670	}
1738	}	1671	}
1739		1672
1740	/*	1673	/*
1741	* add_weight(object, weight) adds the specified weight to an object,	1674	* add_weight(object, weight) adds the specified weight to an object,
…		…
1753	op->carrying += weight;	1686	op->carrying += weight;
1754	op = op->env;	1687	op = op->env;
1755	}	1688	}
1756	}	1689	}
1757		1690
		1691	object *
		1692	insert_ob_in_ob (object *op, object *where)
		1693	{
		1694	if (!where)
		1695	{
		1696	char *dump = dump_object (op);
		1697	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1698	free (dump);
		1699	return op;
		1700	}
		1701
		1702	if (where->head)
		1703	{
		1704	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1705	where = where->head;
		1706	}
		1707
		1708	return where->insert (op);
		1709	}
		1710
1758	/*	1711	/*
1759	* insert_ob_in_ob(op,environment):	1712	* env->insert (op)
1760	* This function inserts the object op in the linked list	1713	* This function inserts the object op in the linked list
1761	* inside the object environment.	1714	* inside the object environment.
1762	*	1715	*
1763	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1764	* the inventory at the last position or next to other objects of the same
1765	* type.
1766	* Frank: Now sorted by type, archetype and magic!
1767	*
1768	* The function returns now pointer to inserted item, and return value can	1716	* The function returns now pointer to inserted item, and return value can
1769	* be != op, if items are merged. -Tero	1717	* be != op, if items are merged. -Tero
1770	*/	1718	*/
1771		1719
1772	object *	1720	object *
1773	insert_ob_in_ob (object *op, object *where)	1721	object::insert (object *op)
1774	{	1722	{
1775	object *	1723	object *tmp, *otmp;
1776	tmp, *
1777	otmp;
1778		1724
1779	if (!QUERY_FLAG (op, FLAG_REMOVED))	1725	if (!QUERY_FLAG (op, FLAG_REMOVED))
1780	{	1726	op->remove ();
1781	dump_object (op);
1782	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1783	return op;
1784	}
1785
1786	if (where == NULL)
1787	{
1788	dump_object (op);
1789	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1790	return op;
1791	}
1792
1793	if (where->head)
1794	{
1795	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1796	where = where->head;
1797	}
1798		1727
1799	if (op->more)	1728	if (op->more)
1800	{	1729	{
1801	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1730	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1802	return op;	1731	return op;
…		…
1804		1733
1805	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1734	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1806	CLEAR_FLAG (op, FLAG_REMOVED);	1735	CLEAR_FLAG (op, FLAG_REMOVED);
1807	if (op->nrof)	1736	if (op->nrof)
1808	{	1737	{
1809	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1738	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1810	if (CAN_MERGE (tmp, op))	1739	if (object::can_merge (tmp, op))
1811	{	1740	{
1812	/* return the original object and remove inserted object	1741	/* return the original object and remove inserted object
1813	(client needs the original object) */	1742	(client needs the original object) */
1814	tmp->nrof += op->nrof;	1743	tmp->nrof += op->nrof;
1815	/* Weight handling gets pretty funky. Since we are adding to	1744	/* Weight handling gets pretty funky. Since we are adding to
1816	* tmp->nrof, we need to increase the weight.	1745	* tmp->nrof, we need to increase the weight.
1817	*/	1746	*/
1818	add_weight (where, op->weight * op->nrof);	1747	add_weight (this, op->weight * op->nrof);
1819	SET_FLAG (op, FLAG_REMOVED);	1748	SET_FLAG (op, FLAG_REMOVED);
1820	free_object (op); /* free the inserted object */	1749	op->destroy (); /* free the inserted object */
1821	op = tmp;	1750	op = tmp;
1822	remove_ob (op); /* and fix old object's links */	1751	op->remove (); /* and fix old object's links */
1823	CLEAR_FLAG (op, FLAG_REMOVED);	1752	CLEAR_FLAG (op, FLAG_REMOVED);
1824	break;	1753	break;
1825	}	1754	}
1826		1755
1827	/* I assume combined objects have no inventory	1756	/* I assume combined objects have no inventory
1828	* We add the weight - this object could have just been removed	1757	* We add the weight - this object could have just been removed
1829	* (if it was possible to merge). calling remove_ob will subtract	1758	* (if it was possible to merge). calling remove_ob will subtract
1830	* the weight, so we need to add it in again, since we actually do	1759	* the weight, so we need to add it in again, since we actually do
1831	* the linking below	1760	* the linking below
1832	*/	1761	*/
1833	add_weight (where, op->weight * op->nrof);	1762	add_weight (this, op->weight * op->nrof);
1834	}	1763	}
1835	else	1764	else
1836	add_weight (where, (op->weight + op->carrying));	1765	add_weight (this, (op->weight + op->carrying));
1837		1766
1838	otmp = is_player_inv (where);	1767	otmp = this->in_player ();
1839	if (otmp && otmp->contr != NULL)	1768	if (otmp && otmp->contr)
1840	{
1841	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1769	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1842	fix_player (otmp);	1770	fix_player (otmp);
1843	}
1844		1771
1845	op->map = NULL;	1772	op->map = 0;
1846	op->env = where;	1773	op->env = this;
1847	op->above = NULL;	1774	op->above = 0;
1848	op->below = NULL;	1775	op->below = 0;
1849	op->x = 0, op->y = 0;	1776	op->x = 0, op->y = 0;
1850		1777
1851	/* reset the light list and los of the players on the map */	1778	/* reset the light list and los of the players on the map */
1852	if ((op->glow_radius != 0) && where->map)	1779	if ((op->glow_radius != 0) && map)
1853	{	1780	{
1854	#ifdef DEBUG_LIGHTS	1781	#ifdef DEBUG_LIGHTS
1855	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1782	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1856	#endif /* DEBUG_LIGHTS */	1783	#endif /* DEBUG_LIGHTS */
1857	if (MAP_DARKNESS (where->map))	1784	if (MAP_DARKNESS (map))
1858	update_all_los (where->map, where->x, where->y);	1785	update_all_los (map, x, y);
1859	}	1786	}
1860		1787
1861	/* Client has no idea of ordering so lets not bother ordering it here.	1788	/* Client has no idea of ordering so lets not bother ordering it here.
1862	* It sure simplifies this function...	1789	* It sure simplifies this function...
1863	*/	1790	*/
1864	if (where->inv == NULL)	1791	if (!inv)
1865	where->inv = op;	1792	inv = op;
1866	else	1793	else
1867	{	1794	{
1868	op->below = where->inv;	1795	op->below = inv;
1869	op->below->above = op;	1796	op->below->above = op;
1870	where->inv = op;	1797	inv = op;
1871	}	1798	}
		1799
1872	return op;	1800	return op;
1873	}	1801	}
1874		1802
1875	/*	1803	/*
1876	* Checks if any objects has a move_type that matches objects	1804	* Checks if any objects has a move_type that matches objects
…		…
1894	*/	1822	*/
1895		1823
1896	int	1824	int
1897	check_move_on (object *op, object *originator)	1825	check_move_on (object *op, object *originator)
1898	{	1826	{
1899	object *	1827	object *tmp;
1900	tmp;	1828	maptile *m = op->map;
1901	tag_t
1902	tag;
1903	mapstruct *
1904	m = op->map;
1905	int
1906	x = op->x, y = op->y;	1829	int x = op->x, y = op->y;
1907		1830
1908	MoveType	1831	MoveType move_on, move_slow, move_block;
1909	move_on,
1910	move_slow,
1911	move_block;
1912		1832
1913	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1833	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1914	return 0;	1834	return 0;
1915
1916	tag = op->count;
1917		1835
1918	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1836	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1919	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1837	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1920	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1838	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1921		1839
…		…
1982	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1900	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1983	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1901	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1984	{	1902	{
1985	move_apply (tmp, op, originator);	1903	move_apply (tmp, op, originator);
1986		1904
1987	if (was_destroyed (op, tag))	1905	if (op->destroyed ())
1988	return 1;	1906	return 1;
1989		1907
1990	/* what the person/creature stepped onto has moved the object	1908	/* what the person/creature stepped onto has moved the object
1991	* someplace new. Don't process any further - if we did,	1909	* someplace new. Don't process any further - if we did,
1992	* have a feeling strange problems would result.	1910	* have a feeling strange problems would result.
…		…
2004	* a matching archetype at the given map and coordinates.	1922	* a matching archetype at the given map and coordinates.
2005	* The first matching object is returned, or NULL if none.	1923	* The first matching object is returned, or NULL if none.
2006	*/	1924	*/
2007		1925
2008	object *	1926	object *
2009	present_arch (const archetype *at, mapstruct *m, int x, int y)	1927	present_arch (const archetype *at, maptile *m, int x, int y)
2010	{	1928	{
2011	object *	1929	object *
2012	tmp;	1930	tmp;
2013		1931
2014	if (m == NULL || out_of_map (m, x, y))	1932	if (m == NULL || out_of_map (m, x, y))
…		…
2027	* a matching type variable at the given map and coordinates.	1945	* a matching type variable at the given map and coordinates.
2028	* The first matching object is returned, or NULL if none.	1946	* The first matching object is returned, or NULL if none.
2029	*/	1947	*/
2030		1948
2031	object *	1949	object *
2032	present (unsigned char type, mapstruct *m, int x, int y)	1950	present (unsigned char type, maptile *m, int x, int y)
2033	{	1951	{
2034	object *	1952	object *
2035	tmp;	1953	tmp;
2036		1954
2037	if (out_of_map (m, x, y))	1955	if (out_of_map (m, x, y))
…		…
2177	* the archetype because that isn't correct if the monster has been	2095	* the archetype because that isn't correct if the monster has been
2178	* customized, changed states, etc.	2096	* customized, changed states, etc.
2179	*/	2097	*/
2180		2098
2181	int	2099	int
2182	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2100	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2183	{	2101	{
2184	int	2102	int
2185	i,	2103	i,
2186	index = 0, flag;	2104	index = 0, flag;
2187	static int	2105	static int
…		…
2199	* if the space being examined only has a wall to the north and empty	2117	* if the space being examined only has a wall to the north and empty
2200	* spaces in all the other directions, this will reduce the search space	2118	* spaces in all the other directions, this will reduce the search space
2201	* to only the spaces immediately surrounding the target area, and	2119	* to only the spaces immediately surrounding the target area, and
2202	* won't look 2 spaces south of the target space.	2120	* won't look 2 spaces south of the target space.
2203	*/	2121	*/
2204	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2122	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2205	stop = maxfree[i];	2123	stop = maxfree[i];
2206	}	2124	}
		2125
2207	if (!index)	2126	if (!index)
2208	return -1;	2127	return -1;
		2128
2209	return altern[RANDOM () % index];	2129	return altern[RANDOM () % index];
2210	}	2130	}
2211		2131
2212	/*	2132	/*
2213	* find_first_free_spot(archetype, mapstruct, x, y) works like	2133	* find_first_free_spot(archetype, maptile, x, y) works like
2214	* find_free_spot(), but it will search max number of squares.	2134	* find_free_spot(), but it will search max number of squares.
2215	* But it will return the first available spot, not a random choice.	2135	* But it will return the first available spot, not a random choice.
2216	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2136	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2217	*/	2137	*/
2218		2138
2219	int	2139	int
2220	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2140	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2221	{	2141	{
2222	int	2142	int
2223	i;	2143	i;
2224		2144
2225	for (i = 0; i < SIZEOFFREE; i++)	2145	for (i = 0; i < SIZEOFFREE; i++)
…		…
2289	* because we have to know what movement the thing looking to move	2209	* because we have to know what movement the thing looking to move
2290	* there is capable of.	2210	* there is capable of.
2291	*/	2211	*/
2292		2212
2293	int	2213	int
2294	find_dir (mapstruct *m, int x, int y, object *exclude)	2214	find_dir (maptile *m, int x, int y, object *exclude)
2295	{	2215	{
2296	int	2216	int
2297	i,	2217	i,
2298	max = SIZEOFFREE, mflags;	2218	max = SIZEOFFREE, mflags;
2299		2219
2300	sint16 nx, ny;	2220	sint16 nx, ny;
2301	object *	2221	object *
2302	tmp;	2222	tmp;
2303	mapstruct *	2223	maptile *
2304	mp;	2224	mp;
2305		2225
2306	MoveType blocked, move_type;	2226	MoveType blocked, move_type;
2307		2227
2308	if (exclude && exclude->head)	2228	if (exclude && exclude->head)
…		…
2516	* Modified to be map tile aware -.MSW	2436	* Modified to be map tile aware -.MSW
2517	*/	2437	*/
2518		2438
2519		2439
2520	int	2440	int
2521	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2441	can_see_monsterP (maptile *m, int x, int y, int dir)
2522	{	2442	{
2523	sint16 dx, dy;	2443	sint16 dx, dy;
2524	int	2444	int
2525	mflags;	2445	mflags;
2526		2446
…		…
2575	* create clone from object to another	2495	* create clone from object to another
2576	*/	2496	*/
2577	object *	2497	object *
2578	object_create_clone (object *asrc)	2498	object_create_clone (object *asrc)
2579	{	2499	{
2580	object *
2581	dst = NULL, *tmp, *src, *part, *prev, *item;	2500	object *dst = 0, *tmp, *src, *part, *prev, *item;
2582		2501
2583	if (!asrc)	2502	if (!asrc)
2584	return NULL;	2503	return 0;
		2504
2585	src = asrc;	2505	src = asrc;
2586	if (src->head)	2506	if (src->head)
2587	src = src->head;	2507	src = src->head;
2588		2508
2589	prev = NULL;	2509	prev = 0;
2590	for (part = src; part; part = part->more)	2510	for (part = src; part; part = part->more)
2591	{	2511	{
2592	tmp = get_object ();	2512	tmp = part->clone ();
2593	copy_object (part, tmp);
2594	tmp->x -= src->x;	2513	tmp->x -= src->x;
2595	tmp->y -= src->y;	2514	tmp->y -= src->y;
		2515
2596	if (!part->head)	2516	if (!part->head)
2597	{	2517	{
2598	dst = tmp;	2518	dst = tmp;
2599	tmp->head = NULL;	2519	tmp->head = 0;
2600	}	2520	}
2601	else	2521	else
2602	{	2522	{
2603	tmp->head = dst;	2523	tmp->head = dst;
2604	}	2524	}
		2525
2605	tmp->more = NULL;	2526	tmp->more = 0;
		2527
2606	if (prev)	2528	if (prev)
2607	prev->more = tmp;	2529	prev->more = tmp;
		2530
2608	prev = tmp;	2531	prev = tmp;
2609	}	2532	}
2610		2533
2611	/*** copy inventory ***/
2612	for (item = src->inv; item; item = item->below)	2534	for (item = src->inv; item; item = item->below)
2613	{
2614	(void) insert_ob_in_ob (object_create_clone (item), dst);	2535	insert_ob_in_ob (object_create_clone (item), dst);
2615	}
2616		2536
2617	return dst;	2537	return dst;
2618	}	2538	}
2619		2539
2620	/* return true if the object was destroyed, 0 otherwise */
2621	int
2622	was_destroyed (const object *op, tag_t old_tag)
2623	{
2624	/* checking for FLAG_FREED isn't necessary, but makes this function more
2625	* robust */
2626	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2627	}
2628
2629	/* GROS - Creates an object using a string representing its content. */	2540	/* GROS - Creates an object using a string representing its content. */
2630
2631	/* Basically, we save the content of the string to a temp file, then call */	2541	/* Basically, we save the content of the string to a temp file, then call */
2632
2633	/* load_object on it. I admit it is a highly inefficient way to make things, */	2542	/* load_object on it. I admit it is a highly inefficient way to make things, */
2634
2635	/* but it was simple to make and allows reusing the load_object function. */	2543	/* but it was simple to make and allows reusing the load_object function. */
2636
2637	/* Remember not to use load_object_str in a time-critical situation. */	2544	/* Remember not to use load_object_str in a time-critical situation. */
2638
2639	/* Also remember that multiparts objects are not supported for now. */	2545	/* Also remember that multiparts objects are not supported for now. */
2640		2546
2641	object *	2547	object *
2642	load_object_str (const char *obstr)	2548	load_object_str (const char *obstr)
2643	{	2549	{
2644	object *	2550	object *op;
2645	op;
2646	char
2647	filename[MAX_BUF];	2551	char filename[MAX_BUF];
2648		2552
2649	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2553	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2650		2554
2651	FILE *
2652	tempfile = fopen (filename, "w");	2555	FILE *tempfile = fopen (filename, "w");
2653		2556
2654	if (tempfile == NULL)	2557	if (tempfile == NULL)
2655	{	2558	{
2656	LOG (llevError, "Error - Unable to access load object temp file\n");	2559	LOG (llevError, "Error - Unable to access load object temp file\n");
2657	return NULL;	2560	return NULL;
2658	};	2561	}
		2562
2659	fprintf (tempfile, obstr);	2563	fprintf (tempfile, obstr);
2660	fclose (tempfile);	2564	fclose (tempfile);
2661		2565
2662	op = get_object ();	2566	op = object::create ();
2663		2567
2664	object_thawer thawer (filename);	2568	object_thawer thawer (filename);
2665		2569
2666	if (thawer)	2570	if (thawer)
2667	load_object (thawer, op, 0);	2571	load_object (thawer, op, 0);
…		…
2677	* returns NULL if no match.	2581	* returns NULL if no match.
2678	*/	2582	*/
2679	object *	2583	object *
2680	find_obj_by_type_subtype (const object *who, int type, int subtype)	2584	find_obj_by_type_subtype (const object *who, int type, int subtype)
2681	{	2585	{
2682	object *	2586	object *tmp;
2683	tmp;
2684		2587
2685	for (tmp = who->inv; tmp; tmp = tmp->below)	2588	for (tmp = who->inv; tmp; tmp = tmp->below)
2686	if (tmp->type == type && tmp->subtype == subtype)	2589	if (tmp->type == type && tmp->subtype == subtype)
2687	return tmp;	2590	return tmp;
2688		2591
…		…
2696	* do the desired thing.	2599	* do the desired thing.
2697	*/	2600	*/
2698	key_value *	2601	key_value *
2699	get_ob_key_link (const object *ob, const char *key)	2602	get_ob_key_link (const object *ob, const char *key)
2700	{	2603	{
2701	key_value *	2604	key_value *link;
2702	link;
2703		2605
2704	for (link = ob->key_values; link != NULL; link = link->next)	2606	for (link = ob->key_values; link != NULL; link = link->next)
2705	{
2706	if (link->key == key)	2607	if (link->key == key)
2707	{
2708	return link;	2608	return link;
2709	}
2710	}
2711		2609
2712	return NULL;	2610	return NULL;
2713	}	2611	}
2714		2612
2715	/*	2613	/*
…		…
2720	* The returned string is shared.	2618	* The returned string is shared.
2721	*/	2619	*/
2722	const char *	2620	const char *
2723	get_ob_key_value (const object *op, const char *const key)	2621	get_ob_key_value (const object *op, const char *const key)
2724	{	2622	{
2725	key_value *	2623	key_value *link;
2726	link;	2624	shstr_cmp canonical_key (key);
2727	const char *
2728	canonical_key;
2729		2625
2730	canonical_key = shstr::find (key);
2731
2732	if (canonical_key == NULL)	2626	if (!canonical_key)
2733	{	2627	{
2734	/* 1. There being a field named key on any object	2628	/* 1. There being a field named key on any object
2735	* implies there'd be a shared string to find.	2629	* implies there'd be a shared string to find.
2736	* 2. Since there isn't, no object has this field.	2630	* 2. Since there isn't, no object has this field.
2737	* 3. Therefore, *this* object doesn't have this field.	2631	* 3. Therefore, *this* object doesn't have this field.
2738	*/	2632	*/
2739	return NULL;	2633	return 0;
2740	}	2634	}
2741		2635
2742	/* This is copied from get_ob_key_link() above -	2636	/* This is copied from get_ob_key_link() above -
2743	* only 4 lines, and saves the function call overhead.	2637	* only 4 lines, and saves the function call overhead.
2744	*/	2638	*/
2745	for (link = op->key_values; link != NULL; link = link->next)	2639	for (link = op->key_values; link; link = link->next)
2746	{
2747	if (link->key == canonical_key)	2640	if (link->key == canonical_key)
2748	{
2749	return link->value;	2641	return link->value;
2750	}	2642
2751	}
2752	return NULL;	2643	return 0;
2753	}	2644	}
2754		2645
2755		2646
2756	/*	2647	/*
2757	* Updates the canonical_key in op to value.	2648	* Updates the canonical_key in op to value.
…		…
2864	}	2755	}
2865	else	2756	else
2866	item = item->env;	2757	item = item->env;
2867	}	2758	}
2868		2759
		2760	// return a suitable string describing an objetc in enough detail to find it
		2761	const char *
		2762	object::debug_desc (char *info) const
		2763	{
		2764	char info2[256 * 3];
		2765	char *p = info;
		2766
		2767	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2768	count,
		2769	&name,
		2770	title ? " " : "",
		2771	title ? (const char *)title : "");
		2772
		2773	if (env)
		2774	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2775
		2776	if (map)
		2777	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2778
		2779	return info;
		2780	}
		2781
		2782	const char *
		2783	object::debug_desc () const
		2784	{
		2785	static char info[256 * 3];
		2786	return debug_desc (info);
		2787	}
		2788

Diff Legend

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