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.32 by root, Mon Sep 11 23:53:30 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. */
…		…
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.
…		…
275	op = op->env;	352	op = op->env;
276	return op;	353	return op;
277	}	354	}
278		355
279	/*	356	/*
280	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
281	* a better check. We basically keeping traversing up until we can't
282	* or find a player.
283	*/
284
285	object *
286	is_player_inv (object *op)
287	{
288	for (; op != NULL && op->type != PLAYER; op = op->env)
289	if (op->env == op)
290	op->env = NULL;
291	return op;
292	}
293
294	/*
295	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
296	* Some error messages.	358	* Some error messages.
297	* 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.
298	*/	360	*/
299		361
300	void	362	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)	363	dump_object (object *op)
356	{	364	{
357	if (op == NULL)	365	if (!op)
358	{	366	return strdup ("[NULLOBJ]");
359	strcpy (errmsg, "[NULL pointer]");
360	return;
361	}
362	errmsg[0] = '\0';
363	dump_object2 (op);
364	}
365		367
366	void	368	object_freezer freezer;
367	dump_all_objects (void)	369	save_object (freezer, op, 3);
368	{	370	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	}	371	}
377		372
378	/*	373	/*
379	* 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
380	* multi-object 1 which is closest to the second object.	375	* multi-object 1 which is closest to the second object.
…		…
400	*/	395	*/
401		396
402	object *	397	object *
403	find_object (tag_t i)	398	find_object (tag_t i)
404	{	399	{
405	object *op;	400	for (object *op = object::first; op; op = op->next)
406
407	for (op = objects; op != NULL; op = op->next)
408	if (op->count == i)	401	if (op->count == i)
409	break;	402	return op;
		403
410	return op;	404	return 0;
411	}	405	}
412		406
413	/*	407	/*
414	* 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.
415	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
…		…
417	*/	411	*/
418		412
419	object *	413	object *
420	find_object_name (const char *str)	414	find_object_name (const char *str)
421	{	415	{
422	const char *name = shstr::find (str);	416	shstr_cmp str_ (str);
423	object *op;	417	object *op;
424		418
425	for (op = objects; op != NULL; op = op->next)	419	for (op = object::first; op != NULL; op = op->next)
426	if (&op->name == name)	420	if (op->name == str_)
427	break;	421	break;
428		422
429	return op;	423	return op;
430	}	424	}
431		425
432	void	426	void
433	free_all_object_data ()	427	free_all_object_data ()
434	{	428	{
435	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	429	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	}	430	}
458		431
459	/*	432	/*
460	* 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
461	* skill and experience objects.	434	* skill and experience objects.
…		…
531		504
532	/* What is not cleared is next, prev, and count */	505	/* What is not cleared is next, prev, and count */
533		506
534	expmul = 1.0;	507	expmul = 1.0;
535	face = blank_face;	508	face = blank_face;
536	attacked_by_count = -1;
537		509
538	if (settings.casting_time)	510	if (settings.casting_time)
539	casting_time = -1;	511	casting_time = -1;
540	}	512	}
541		513
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	/*	514	/*
552	* copy object first frees everything allocated by the second object,	515	* copy_to first frees everything allocated by the dst object,
553	* and then copies the contends of the first object into the second	516	* and then copies the contents of itself into the second
554	* object, allocating what needs to be allocated. Basically, any	517	* object, allocating what needs to be allocated. Basically, any
555	* 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,
556	* 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
557	* will point at garbage.	520	* will point at garbage.
558	*/	521	*/
559	void	522	void
560	copy_object (object *op2, object *op)	523	object::copy_to (object *dst)
561	{	524	{
562	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	525	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
563	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	526	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
564		527
565	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));
566		533
567	if (is_freed)	534	if (is_freed)
568	SET_FLAG (op, FLAG_FREED);	535	SET_FLAG (dst, FLAG_FREED);
		536
569	if (is_removed)	537	if (is_removed)
570	SET_FLAG (op, FLAG_REMOVED);	538	SET_FLAG (dst, FLAG_REMOVED);
571		539
572	if (op2->speed < 0)	540	if (speed < 0)
573	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	541	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
574		542
575	/* Copy over key_values, if any. */	543	/* Copy over key_values, if any. */
576	if (op2->key_values)	544	if (key_values)
577	{	545	{
578	key_value *tail = 0;	546	key_value *tail = 0;
579	key_value *i;	547	key_value *i;
580		548
581	op->key_values = 0;	549	dst->key_values = 0;
582		550
583	for (i = op2->key_values; i; i = i->next)	551	for (i = key_values; i; i = i->next)
584	{	552	{
585	key_value *new_link = new key_value;	553	key_value *new_link = new key_value;
586		554
587	new_link->next = 0;	555	new_link->next = 0;
588	new_link->key = i->key;	556	new_link->key = i->key;
589	new_link->value = i->value;	557	new_link->value = i->value;
590		558
591	/* Try and be clever here, too. */	559	/* Try and be clever here, too. */
592	if (!op->key_values)	560	if (!dst->key_values)
593	{	561	{
594	op->key_values = new_link;	562	dst->key_values = new_link;
595	tail = new_link;	563	tail = new_link;
596	}	564	}
597	else	565	else
598	{	566	{
599	tail->next = new_link;	567	tail->next = new_link;
600	tail = new_link;	568	tail = new_link;
601	}	569	}
602	}	570	}
603	}	571	}
604		572
605	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;
606	}	582	}
607		583
608	/*	584	/*
609	* 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
610	* 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
…		…
815	update_now = 1;	791	update_now = 1;
816		792
817	if ((move_slow | op->move_slow) != move_slow)	793	if ((move_slow | op->move_slow) != move_slow)
818	update_now = 1;	794	update_now = 1;
819	}	795	}
		796
820	/* if the object is being removed, we can't make intelligent	797	/* if the object is being removed, we can't make intelligent
821	* decisions, because remove_ob can't really pass the object	798	* decisions, because remove_ob can't really pass the object
822	* that is being removed.	799	* that is being removed.
823	*/	800	*/
824	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	801	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
…		…
836		813
837	if (op->more != NULL)	814	if (op->more != NULL)
838	update_object (op->more, action);	815	update_object (op->more, action);
839	}	816	}
840		817
841	static unordered_vector<object *> mortals;	818	object::vector object::mortals;
842	static std::vector<object *> freed;	819	object::vector object::objects; // not yet used
		820	object *object::first;
843		821
844	void object::free_mortals ()	822	void object::free_mortals ()
845	{	823	{
846	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	824	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
847	if ((*i)->refcnt)	825	if ((*i)->refcnt)
848	++i; // further delay freeing	826	++i; // further delay freeing
849	else	827	else
850	{	828	{
851	freed.push_back (*i);//D
852	//delete *i;	829	delete *i;
853	mortals.erase (i);	830	mortals.erase (i);
854	}	831	}
855
856	if (mortals.size())//D
857	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
858	}	832	}
859		833
860	object::object ()	834	object::object ()
861	{	835	{
862	SET_FLAG (this, FLAG_REMOVED);	836	SET_FLAG (this, FLAG_REMOVED);
863		837
864	expmul = 1.0;	838	expmul = 1.0;
865	face = blank_face;	839	face = blank_face;
866	attacked_by_count = -1;
867	}	840	}
868		841
869	object::~object ()	842	object::~object ()
870	{	843	{
871	free_key_values (this);	844	free_key_values (this);
872	}	845	}
873		846
874	void object::link ()	847	void object::link ()
875	{	848	{
876	count = ++ob_count;	849	count = ++ob_count;
		850	uuid = gen_uuid ();
877		851
878	prev = 0;	852	prev = 0;
879	next = objects;	853	next = object::first;
880		854
881	if (objects)	855	if (object::first)
882	objects->prev = this;	856	object::first->prev = this;
883		857
884	objects = this;	858	object::first = this;
885	}	859	}
886		860
887	void object::unlink ()	861	void object::unlink ()
888	{	862	{
889	count = 0;	863	if (this == object::first)
		864	object::first = next;
890		865
891	/* Remove this object from the list of used objects */	866	/* Remove this object from the list of used objects */
892	if (prev)
893	{
894	prev->next = next;	867	if (prev) prev->next = next;
		868	if (next) next->prev = prev;
		869
895	prev = 0;	870	prev = 0;
896	}
897
898	if (next)
899	{
900	next->prev = prev;
901	next = 0;	871	next = 0;
902	}
903
904	if (this == objects)
905	objects = next;
906	}	872	}
907		873
908	object *object::create ()	874	object *object::create ()
909	{	875	{
910	object *op;
911
912	if (freed.empty ())
913	op = new object;	876	object *op = new object;
914	else
915	{
916	// highly annoying, but the only way to get it stable right now
917	op = freed.back ();
918	freed.pop_back ();
919	op->~object ();
920	new ((void *) op) object;
921	}
922
923	op->link ();	877	op->link ();
924	return op;	878	return op;
925	}	879	}
926		880
927	/*	881	/*
…		…
929	* 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
930	* free objects. The IS_FREED() flag is set in the object.	884	* free objects. The IS_FREED() flag is set in the object.
931	* The object must have been removed by remove_ob() first for	885	* The object must have been removed by remove_ob() first for
932	* this function to succeed.	886	* this function to succeed.
933	*	887	*
934	* 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
935	* inventory to the ground.	889	* inventory to the ground.
936	*/	890	*/
937	void object::free (bool free_inventory)	891	void object::destroy (bool destroy_inventory)
938	{	892	{
939	if (QUERY_FLAG (this, FLAG_FREED))	893	if (QUERY_FLAG (this, FLAG_FREED))
940	return;	894	return;
941		895
942	if (QUERY_FLAG (this, FLAG_FRIENDLY))	896	if (QUERY_FLAG (this, FLAG_FRIENDLY))
943	remove_friendly_object (this);	897	remove_friendly_object (this);
944		898
945	if (!QUERY_FLAG (this, FLAG_REMOVED))	899	if (!QUERY_FLAG (this, FLAG_REMOVED))
946	remove_ob (this);	900	remove ();
947		901
948	SET_FLAG (this, FLAG_FREED);	902	SET_FLAG (this, FLAG_FREED);
949		903
950	if (more)	904	if (more)
951	{	905	{
952	more->free (free_inventory);	906	more->destroy (destroy_inventory);
953	more = 0;	907	more = 0;
954	}	908	}
955		909
956	if (inv)	910	if (inv)
957	{	911	{
958	/* Only if the space blocks everything do we not process -	912	/* Only if the space blocks everything do we not process -
959	* if some form of movement is allowed, let objects	913	* if some form of movement is allowed, let objects
960	* drop on that space.	914	* drop on that space.
961	*/	915	*/
962	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)
963	{	917	{
964	object *op = inv;	918	object *op = inv;
965		919
966	while (op)	920	while (op)
967	{	921	{
968	object *tmp = op->below;	922	object *tmp = op->below;
969	op->free (free_inventory);	923	op->destroy (destroy_inventory);
970	op = tmp;	924	op = tmp;
971	}	925	}
972	}	926	}
973	else	927	else
974	{ /* Put objects in inventory onto this space */	928	{ /* Put objects in inventory onto this space */
…		…
976		930
977	while (op)	931	while (op)
978	{	932	{
979	object *tmp = op->below;	933	object *tmp = op->below;
980		934
981	remove_ob (op);	935	op->remove ();
982		936
983	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	937	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
984	|| 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))
985	free_object (op);	939	op->destroy ();
986	else	940	else
987	{	941	{
988	op->x = x;	942	op->x = x;
989	op->y = y;	943	op->y = y;
990	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 */
…		…
993	op = tmp;	947	op = tmp;
994	}	948	}
995	}	949	}
996	}	950	}
997		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
998	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;
999		979
1000	/* Remove object from the active list */	980	/* Remove object from the active list */
1001	speed = 0;	981	speed = 0;
1002	update_ob_speed (this);	982	update_ob_speed (this);
1003		983
…		…
1008		988
1009	/*	989	/*
1010	* sub_weight() recursively (outwards) subtracts a number from the	990	* sub_weight() recursively (outwards) subtracts a number from the
1011	* 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)).
1012	*/	992	*/
1013
1014	void	993	void
1015	sub_weight (object *op, signed long weight)	994	sub_weight (object *op, signed long weight)
1016	{	995	{
1017	while (op != NULL)	996	while (op != NULL)
1018	{	997	{
1019	if (op->type == CONTAINER)	998	if (op->type == CONTAINER)
1020	{
1021	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	999	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1022	}	1000
1023	op->carrying -= weight;	1001	op->carrying -= weight;
1024	op = op->env;	1002	op = op->env;
1025	}	1003	}
1026	}	1004	}
1027		1005
1028	/* remove_ob(op):	1006	/* op->remove ():
1029	* 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
1030	* 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
1031	* object will have no environment. If the object previously had an	1009	* object will have no environment. If the object previously had an
1032	* environment, the x and y coordinates will be updated to	1010	* environment, the x and y coordinates will be updated to
1033	* the previous environment.	1011	* the previous environment.
1034	* Beware: This function is called from the editor as well!	1012	* Beware: This function is called from the editor as well!
1035	*/	1013	*/
1036
1037	void	1014	void
1038	remove_ob (object *op)	1015	object::remove ()
1039	{	1016	{
		1017	object *tmp, *last = 0;
1040	object *	1018	object *otmp;
1041	tmp, *
1042	last = NULL;
1043	object *
1044	otmp;
1045		1019
1046	tag_t
1047	tag;
1048	int
1049	check_walk_off;	1020	int check_walk_off;
1050	mapstruct *
1051	m;
1052		1021
1053	sint16
1054	x,
1055	y;
1056
1057	if (QUERY_FLAG (op, FLAG_REMOVED))	1022	if (QUERY_FLAG (this, FLAG_REMOVED))
1058	return;	1023	return;
1059		1024
1060	SET_FLAG (op, FLAG_REMOVED);	1025	SET_FLAG (this, FLAG_REMOVED);
1061		1026
1062	if (op->more != NULL)	1027	if (more)
1063	remove_ob (op->more);	1028	more->remove ();
1064		1029
1065	/*	1030	/*
1066	* In this case, the object to be removed is in someones	1031	* In this case, the object to be removed is in someones
1067	* inventory.	1032	* inventory.
1068	*/	1033	*/
1069	if (op->env != NULL)	1034	if (env)
1070	{	1035	{
1071	if (op->nrof)	1036	if (nrof)
1072	sub_weight (op->env, op->weight * op->nrof);	1037	sub_weight (env, weight * nrof);
1073	else	1038	else
1074	sub_weight (op->env, op->weight + op->carrying);	1039	sub_weight (env, weight + carrying);
1075		1040
1076	/* 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
1077	* made to players inventory. If set, avoiding the call	1042	* made to players inventory. If set, avoiding the call
1078	* to save cpu time.	1043	* to save cpu time.
1079	*/	1044	*/
1080	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))
1081	fix_player (otmp);	1046	fix_player (otmp);
1082		1047
1083	if (op->above != NULL)	1048	if (above != NULL)
1084	op->above->below = op->below;	1049	above->below = below;
1085	else	1050	else
1086	op->env->inv = op->below;	1051	env->inv = below;
1087		1052
1088	if (op->below != NULL)	1053	if (below != NULL)
1089	op->below->above = op->above;	1054	below->above = above;
1090		1055
1091	/* we set up values so that it could be inserted into	1056	/* we set up values so that it could be inserted into
1092	* 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
1093	* to the caller to decide what we want to do.	1058	* to the caller to decide what we want to do.
1094	*/	1059	*/
1095	op->x = op->env->x, op->y = op->env->y;	1060	x = env->x, y = env->y;
1096	op->map = op->env->map;	1061	map = env->map;
1097	op->above = NULL, op->below = NULL;	1062	above = 0, below = 0;
1098	op->env = NULL;	1063	env = 0;
1099	}	1064	}
1100	else if (op->map)	1065	else if (map)
1101	{	1066	{
1102	x = op->x;
1103	y = op->y;
1104	m = get_map_from_coord (op->map, &x, &y);
1105
1106	if (!m)
1107	{
1108	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1109	op->map->path, op->x, op->y);
1110	/* in old days, we used to set x and y to 0 and continue.
1111	* it seems if we get into this case, something is probablye
1112	* screwed up and should be fixed.
1113	*/
1114	abort ();
1115	}
1116
1117	if (op->map != m)
1118	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1119	op->map->path, m->path, op->x, op->y, x, y);
1120
1121	/* 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
1122	* lots of logic for things we no longer care about	1068	* lots of logic for things we no longer care about
1123	*/	1069	*/
1124		1070
1125	/* link the object above us */	1071	/* link the object above us */
1126	if (op->above)	1072	if (above)
1127	op->above->below = op->below;	1073	above->below = below;
1128	else	1074	else
1129	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 */
1130		1076
1131	/* Relink the object below us, if there is one */	1077	/* Relink the object below us, if there is one */
1132	if (op->below)	1078	if (below)
1133	op->below->above = op->above;	1079	below->above = above;
1134	else	1080	else
1135	{	1081	{
1136	/* 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
1137	* use translated coordinates in case some oddness with map tiling is	1083	* use translated coordinates in case some oddness with map tiling is
1138	* evident	1084	* evident
1139	*/	1085	*/
1140	if (GET_MAP_OB (m, x, y) != op)	1086	if (GET_MAP_OB (map, x, y) != this)
1141	{	1087	{
1142	dump_object (op);	1088	char *dump = dump_object (this);
1143	LOG (llevError,	1089	LOG (llevError,
1144	"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);
1145	dump_object (GET_MAP_OB (m, x, y));	1092	dump = dump_object (GET_MAP_OB (map, x, y));
1146	LOG (llevError, "%s\n", errmsg);	1093	LOG (llevError, "%s\n", dump);
		1094	free (dump);
1147	}	1095	}
1148		1096
1149	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1097	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1150	}	1098	}
1151		1099
1152	op->above = 0;	1100	above = 0;
1153	op->below = 0;	1101	below = 0;
1154		1102
1155	if (op->map->in_memory == MAP_SAVING)	1103	if (map->in_memory == MAP_SAVING)
1156	return;	1104	return;
1157		1105
1158	tag = op->count;
1159	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1106	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1160		1107
1161	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)
1162	{	1109	{
1163	/* 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
1164	* being removed.	1111	* being removed.
1165	*/	1112	*/
1166		1113
1167	if (tmp->type == PLAYER && tmp != op)	1114	if (tmp->type == PLAYER && tmp != this)
1168	{	1115	{
1169	/* If a container that the player is currently using somehow gets	1116	/* If a container that the player is currently using somehow gets
1170	* removed (most likely destroyed), update the player view	1117	* removed (most likely destroyed), update the player view
1171	* appropriately.	1118	* appropriately.
1172	*/	1119	*/
1173	if (tmp->container == op)	1120	if (tmp->container == this)
1174	{	1121	{
1175	CLEAR_FLAG (op, FLAG_APPLIED);	1122	CLEAR_FLAG (this, FLAG_APPLIED);
1176	tmp->container = NULL;	1123	tmp->container = 0;
1177	}	1124	}
1178		1125
1179	tmp->contr->socket.update_look = 1;	1126	tmp->contr->socket->floorbox_update ();
1180	}	1127	}
1181		1128
1182	/* See if player moving off should effect something */	1129	/* See if player moving off should effect something */
1183	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))
1184	{	1133	{
1185	move_apply (tmp, op, NULL);	1134	move_apply (tmp, this, 0);
1186		1135
1187	if (was_destroyed (op, tag))	1136	if (destroyed ())
1188	{
1189	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 ());
1190	}
1191	}	1138	}
1192		1139
1193	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1140	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1194		1141
1195	if (tmp->above == tmp)	1142	if (tmp->above == tmp)
1196	tmp->above = NULL;	1143	tmp->above = 0;
1197		1144
1198	last = tmp;	1145	last = tmp;
1199	}	1146	}
1200		1147
1201	/* last == NULL of there are no objects on this space */	1148	/* last == NULL of there are no objects on this space */
1202	if (last == NULL)	1149	if (!last)
1203	{	1150	{
1204	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1151	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1205	* 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
1206	* 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
1207	* be correct anyways.	1154	* be correct anyways.
1208	*/	1155	*/
1209	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1156	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1210	update_position (op->map, op->x, op->y);	1157	update_position (map, x, y);
1211	}	1158	}
1212	else	1159	else
1213	update_object (last, UP_OBJ_REMOVE);	1160	update_object (last, UP_OBJ_REMOVE);
1214		1161
1215	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1162	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1216	update_all_los (op->map, op->x, op->y);	1163	update_all_los (map, x, y);
1217	}	1164	}
1218	}	1165	}
1219		1166
1220	/*	1167	/*
1221	* merge_ob(op,top):	1168	* merge_ob(op,top):
…		…
1223	* This function goes through all objects below and including top, and	1170	* This function goes through all objects below and including top, and
1224	* merges op to the first matching object.	1171	* merges op to the first matching object.
1225	* If top is NULL, it is calculated.	1172	* If top is NULL, it is calculated.
1226	* 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
1227	*/	1174	*/
1228
1229	object *	1175	object *
1230	merge_ob (object *op, object *top)	1176	merge_ob (object *op, object *top)
1231	{	1177	{
1232	if (!op->nrof)	1178	if (!op->nrof)
1233	return 0;	1179	return 0;
…		…
1237		1183
1238	for (; top != NULL; top = top->below)	1184	for (; top != NULL; top = top->below)
1239	{	1185	{
1240	if (top == op)	1186	if (top == op)
1241	continue;	1187	continue;
1242	if (CAN_MERGE (op, top))	1188
		1189	if (object::can_merge (op, top))
1243	{	1190	{
1244	top->nrof += op->nrof;	1191	top->nrof += op->nrof;
1245		1192
1246	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1193	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1247	op->weight = 0; /* Don't want any adjustements now */	1194	op->weight = 0; /* Don't want any adjustements now */
1248	remove_ob (op);	1195	op->destroy ();
1249	free_object (op);
1250	return top;	1196	return top;
1251	}	1197	}
1252	}	1198	}
1253		1199
1254	return NULL;	1200	return 0;
1255	}	1201	}
1256		1202
1257	/*	1203	/*
1258	* 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
1259	* job preparing multi-part monsters	1205	* job preparing multi-part monsters
1260	*/	1206	*/
1261	object *	1207	object *
1262	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)
1263	{	1209	{
1264	object *tmp;	1210	object *tmp;
1265		1211
1266	if (op->head)	1212	if (op->head)
1267	op = op->head;	1213	op = op->head;
…		…
1295	* NULL if 'op' was destroyed	1241	* NULL if 'op' was destroyed
1296	* just 'op' otherwise	1242	* just 'op' otherwise
1297	*/	1243	*/
1298		1244
1299	object *	1245	object *
1300	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)
1301	{	1247	{
1302	object *tmp, *top, *floor = NULL;	1248	object *tmp, *top, *floor = NULL;
1303	sint16 x, y;	1249	sint16 x, y;
1304		1250
1305	if (QUERY_FLAG (op, FLAG_FREED))	1251	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1308	return NULL;	1254	return NULL;
1309	}	1255	}
1310		1256
1311	if (m == NULL)	1257	if (m == NULL)
1312	{	1258	{
1313	dump_object (op);	1259	char *dump = dump_object (op);
1314	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);
1315	return op;	1262	return op;
1316	}	1263	}
1317		1264
1318	if (out_of_map (m, op->x, op->y))	1265	if (out_of_map (m, op->x, op->y))
1319	{	1266	{
1320	dump_object (op);	1267	char *dump = dump_object (op);
1321	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);
1322	#ifdef MANY_CORES	1269	#ifdef MANY_CORES
1323	/* 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
1324	* 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
1325	* improperly inserted.	1272	* improperly inserted.
1326	*/	1273	*/
1327	abort ();	1274	abort ();
1328	#endif	1275	#endif
		1276	free (dump);
1329	return op;	1277	return op;
1330	}	1278	}
1331		1279
1332	if (!QUERY_FLAG (op, FLAG_REMOVED))	1280	if (!QUERY_FLAG (op, FLAG_REMOVED))
1333	{	1281	{
1334	dump_object (op);	1282	char *dump = dump_object (op);
1335	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);
1336	return op;	1285	return op;
1337	}	1286	}
1338		1287
1339	if (op->more != NULL)	1288	if (op->more != NULL)
1340	{	1289	{
…		…
1378		1327
1379	/* this has to be done after we translate the coordinates.	1328	/* this has to be done after we translate the coordinates.
1380	*/	1329	*/
1381	if (op->nrof && !(flag & INS_NO_MERGE))	1330	if (op->nrof && !(flag & INS_NO_MERGE))
1382	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)
1383	if (CAN_MERGE (op, tmp))	1332	if (object::can_merge (op, tmp))
1384	{	1333	{
1385	op->nrof += tmp->nrof;	1334	op->nrof += tmp->nrof;
1386	remove_ob (tmp);	1335	tmp->destroy ();
1387	free_object (tmp);
1388	}	1336	}
1389		1337
1390	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 */
1391	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1339	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1392		1340
…		…
1520	* it, so save a few ticks and start from there.	1468	* it, so save a few ticks and start from there.
1521	*/	1469	*/
1522	if (!(flag & INS_MAP_LOAD))	1470	if (!(flag & INS_MAP_LOAD))
1523	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)
1524	if (tmp->type == PLAYER)	1472	if (tmp->type == PLAYER)
1525	tmp->contr->socket.update_look = 1;	1473	tmp->contr->socket->floorbox_update ();
1526		1474
1527	/* If this object glows, it may affect lighting conditions that are	1475	/* If this object glows, it may affect lighting conditions that are
1528	* 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
1529	* 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
1530	* on the map will get recalculated. The players could very well	1478	* on the map will get recalculated. The players could very well
…		…
1538		1486
1539	/* updates flags (blocked, alive, no magic, etc) for this map space */	1487	/* updates flags (blocked, alive, no magic, etc) for this map space */
1540	update_object (op, UP_OBJ_INSERT);	1488	update_object (op, UP_OBJ_INSERT);
1541		1489
1542	/* 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,
1543	* we want to have update_look set above before calling this.	1491	* we want to have floorbox_update called before calling this.
1544	*	1492	*
1545	* check_move_on() must be after this because code called from	1493	* check_move_on() must be after this because code called from
1546	* check_move_on() depends on correct map flags (so functions like	1494	* check_move_on() depends on correct map flags (so functions like
1547	* blocked() and wall() work properly), and these flags are updated by	1495	* blocked() and wall() work properly), and these flags are updated by
1548	* update_object().	1496	* update_object().
…		…
1578	tmp1;	1526	tmp1;
1579		1527
1580	/* first search for itself and remove any old instances */	1528	/* first search for itself and remove any old instances */
1581		1529
1582	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)
1583	{
1584	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1531	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1585	{	1532	tmp->destroy ();
1586	remove_ob (tmp);
1587	free_object (tmp);
1588	}
1589	}
1590		1533
1591	tmp1 = arch_to_object (find_archetype (arch_string));	1534	tmp1 = arch_to_object (archetype::find (arch_string));
1592		1535
1593	tmp1->x = op->x;	1536	tmp1->x = op->x;
1594	tmp1->y = op->y;	1537	tmp1->y = op->y;
1595	insert_ob_in_map (tmp1, op->map, op, 0);	1538	insert_ob_in_map (tmp1, op->map, op, 0);
1596	}	1539	}
…		…
1604	*/	1547	*/
1605		1548
1606	object *	1549	object *
1607	get_split_ob (object *orig_ob, uint32 nr)	1550	get_split_ob (object *orig_ob, uint32 nr)
1608	{	1551	{
1609	object *	1552	object *newob;
1610	newob;
1611	int
1612	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1553	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1613		1554
1614	if (orig_ob->nrof < nr)	1555	if (orig_ob->nrof < nr)
1615	{	1556	{
1616	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);
1617	return NULL;	1558	return NULL;
1618	}	1559	}
1619		1560
1620	newob = object_create_clone (orig_ob);	1561	newob = object_create_clone (orig_ob);
1621		1562
1622	if ((orig_ob->nrof -= nr) < 1)	1563	if ((orig_ob->nrof -= nr) < 1)
1623	{	1564	orig_ob->destroy (1);
1624	if (!is_removed)
1625	remove_ob (orig_ob);
1626	free_object2 (orig_ob, 1);
1627	}
1628	else if (!is_removed)	1565	else if (!is_removed)
1629	{	1566	{
1630	if (orig_ob->env != NULL)	1567	if (orig_ob->env != NULL)
1631	sub_weight (orig_ob->env, orig_ob->weight * nr);	1568	sub_weight (orig_ob->env, orig_ob->weight * nr);
1632	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)
…		…
1662	if (i > op->nrof)	1599	if (i > op->nrof)
1663	i = op->nrof;	1600	i = op->nrof;
1664		1601
1665	if (QUERY_FLAG (op, FLAG_REMOVED))	1602	if (QUERY_FLAG (op, FLAG_REMOVED))
1666	op->nrof -= i;	1603	op->nrof -= i;
1667	else if (op->env != NULL)	1604	else if (op->env)
1668	{	1605	{
1669	/* is this object in the players inventory, or sub container	1606	/* is this object in the players inventory, or sub container
1670	* therein?	1607	* therein?
1671	*/	1608	*/
1672	tmp = is_player_inv (op->env);	1609	tmp = op->in_player ();
1673	/* nope. Is this a container the player has opened?	1610	/* nope. Is this a container the player has opened?
1674	* If so, set tmp to that player.	1611	* If so, set tmp to that player.
1675	* IMO, searching through all the players will mostly	1612	* IMO, searching through all the players will mostly
1676	* likely be quicker than following op->env to the map,	1613	* likely be quicker than following op->env to the map,
1677	* and then searching the map for a player.	1614	* and then searching the map for a player.
1678	*/	1615	*/
1679	if (!tmp)	1616	if (!tmp)
1680	{	1617	{
1681	for (pl = first_player; pl; pl = pl->next)	1618	for (pl = first_player; pl; pl = pl->next)
1682	if (pl->ob->container == op->env)	1619	if (pl->ob->container == op->env)
		1620	{
		1621	tmp = pl->ob;
1683	break;	1622	break;
1684	if (pl)	1623	}
1685	tmp = pl->ob;
1686	else
1687	tmp = NULL;
1688	}	1624	}
1689		1625
1690	if (i < op->nrof)	1626	if (i < op->nrof)
1691	{	1627	{
1692	sub_weight (op->env, op->weight * i);	1628	sub_weight (op->env, op->weight * i);
1693	op->nrof -= i;	1629	op->nrof -= i;
1694	if (tmp)	1630	if (tmp)
1695	{
1696	esrv_send_item (tmp, op);	1631	esrv_send_item (tmp, op);
1697	}
1698	}	1632	}
1699	else	1633	else
1700	{	1634	{
1701	remove_ob (op);	1635	op->remove ();
1702	op->nrof = 0;	1636	op->nrof = 0;
1703	if (tmp)	1637	if (tmp)
1704	{
1705	esrv_del_item (tmp->contr, op->count);	1638	esrv_del_item (tmp->contr, op->count);
1706	}
1707	}	1639	}
1708	}	1640	}
1709	else	1641	else
1710	{	1642	{
1711	object *above = op->above;	1643	object *above = op->above;
1712		1644
1713	if (i < op->nrof)	1645	if (i < op->nrof)
1714	op->nrof -= i;	1646	op->nrof -= i;
1715	else	1647	else
1716	{	1648	{
1717	remove_ob (op);	1649	op->remove ();
1718	op->nrof = 0;	1650	op->nrof = 0;
1719	}	1651	}
1720		1652
1721	/* Since we just removed op, op->above is null */	1653	/* Since we just removed op, op->above is null */
1722	for (tmp = above; tmp != NULL; tmp = tmp->above)	1654	for (tmp = above; tmp; tmp = tmp->above)
1723	if (tmp->type == PLAYER)	1655	if (tmp->type == PLAYER)
1724	{	1656	{
1725	if (op->nrof)	1657	if (op->nrof)
1726	esrv_send_item (tmp, op);	1658	esrv_send_item (tmp, op);
1727	else	1659	else
…		…
1731		1663
1732	if (op->nrof)	1664	if (op->nrof)
1733	return op;	1665	return op;
1734	else	1666	else
1735	{	1667	{
1736	free_object (op);	1668	op->destroy ();
1737	return NULL;	1669	return 0;
1738	}	1670	}
1739	}	1671	}
1740		1672
1741	/*	1673	/*
1742	* add_weight(object, weight) adds the specified weight to an object,	1674	* add_weight(object, weight) adds the specified weight to an object,
…		…
1754	op->carrying += weight;	1686	op->carrying += weight;
1755	op = op->env;	1687	op = op->env;
1756	}	1688	}
1757	}	1689	}
1758		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
1759	/*	1711	/*
1760	* insert_ob_in_ob(op,environment):	1712	* env->insert (op)
1761	* This function inserts the object op in the linked list	1713	* This function inserts the object op in the linked list
1762	* inside the object environment.	1714	* inside the object environment.
1763	*	1715	*
1764	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1765	* the inventory at the last position or next to other objects of the same
1766	* type.
1767	* Frank: Now sorted by type, archetype and magic!
1768	*
1769	* 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
1770	* be != op, if items are merged. -Tero	1717	* be != op, if items are merged. -Tero
1771	*/	1718	*/
1772		1719
1773	object *	1720	object *
1774	insert_ob_in_ob (object *op, object *where)	1721	object::insert (object *op)
1775	{	1722	{
1776	object *	1723	object *tmp, *otmp;
1777	tmp, *
1778	otmp;
1779		1724
1780	if (!QUERY_FLAG (op, FLAG_REMOVED))	1725	if (!QUERY_FLAG (op, FLAG_REMOVED))
1781	{	1726	op->remove ();
1782	dump_object (op);
1783	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1784	return op;
1785	}
1786
1787	if (where == NULL)
1788	{
1789	dump_object (op);
1790	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1791	return op;
1792	}
1793
1794	if (where->head)
1795	{
1796	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1797	where = where->head;
1798	}
1799		1727
1800	if (op->more)	1728	if (op->more)
1801	{	1729	{
1802	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);
1803	return op;	1731	return op;
…		…
1805		1733
1806	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1734	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1807	CLEAR_FLAG (op, FLAG_REMOVED);	1735	CLEAR_FLAG (op, FLAG_REMOVED);
1808	if (op->nrof)	1736	if (op->nrof)
1809	{	1737	{
1810	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1738	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1811	if (CAN_MERGE (tmp, op))	1739	if (object::can_merge (tmp, op))
1812	{	1740	{
1813	/* return the original object and remove inserted object	1741	/* return the original object and remove inserted object
1814	(client needs the original object) */	1742	(client needs the original object) */
1815	tmp->nrof += op->nrof;	1743	tmp->nrof += op->nrof;
1816	/* Weight handling gets pretty funky. Since we are adding to	1744	/* Weight handling gets pretty funky. Since we are adding to
1817	* tmp->nrof, we need to increase the weight.	1745	* tmp->nrof, we need to increase the weight.
1818	*/	1746	*/
1819	add_weight (where, op->weight * op->nrof);	1747	add_weight (this, op->weight * op->nrof);
1820	SET_FLAG (op, FLAG_REMOVED);	1748	SET_FLAG (op, FLAG_REMOVED);
1821	free_object (op); /* free the inserted object */	1749	op->destroy (); /* free the inserted object */
1822	op = tmp;	1750	op = tmp;
1823	remove_ob (op); /* and fix old object's links */	1751	op->remove (); /* and fix old object's links */
1824	CLEAR_FLAG (op, FLAG_REMOVED);	1752	CLEAR_FLAG (op, FLAG_REMOVED);
1825	break;	1753	break;
1826	}	1754	}
1827		1755
1828	/* I assume combined objects have no inventory	1756	/* I assume combined objects have no inventory
1829	* We add the weight - this object could have just been removed	1757	* We add the weight - this object could have just been removed
1830	* (if it was possible to merge). calling remove_ob will subtract	1758	* (if it was possible to merge). calling remove_ob will subtract
1831	* 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
1832	* the linking below	1760	* the linking below
1833	*/	1761	*/
1834	add_weight (where, op->weight * op->nrof);	1762	add_weight (this, op->weight * op->nrof);
1835	}	1763	}
1836	else	1764	else
1837	add_weight (where, (op->weight + op->carrying));	1765	add_weight (this, (op->weight + op->carrying));
1838		1766
1839	otmp = is_player_inv (where);	1767	otmp = this->in_player ();
1840	if (otmp && otmp->contr != NULL)	1768	if (otmp && otmp->contr)
1841	{
1842	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1769	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1843	fix_player (otmp);	1770	fix_player (otmp);
1844	}
1845		1771
1846	op->map = NULL;	1772	op->map = 0;
1847	op->env = where;	1773	op->env = this;
1848	op->above = NULL;	1774	op->above = 0;
1849	op->below = NULL;	1775	op->below = 0;
1850	op->x = 0, op->y = 0;	1776	op->x = 0, op->y = 0;
1851		1777
1852	/* 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 */
1853	if ((op->glow_radius != 0) && where->map)	1779	if ((op->glow_radius != 0) && map)
1854	{	1780	{
1855	#ifdef DEBUG_LIGHTS	1781	#ifdef DEBUG_LIGHTS
1856	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);
1857	#endif /* DEBUG_LIGHTS */	1783	#endif /* DEBUG_LIGHTS */
1858	if (MAP_DARKNESS (where->map))	1784	if (MAP_DARKNESS (map))
1859	update_all_los (where->map, where->x, where->y);	1785	update_all_los (map, x, y);
1860	}	1786	}
1861		1787
1862	/* 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.
1863	* It sure simplifies this function...	1789	* It sure simplifies this function...
1864	*/	1790	*/
1865	if (where->inv == NULL)	1791	if (!inv)
1866	where->inv = op;	1792	inv = op;
1867	else	1793	else
1868	{	1794	{
1869	op->below = where->inv;	1795	op->below = inv;
1870	op->below->above = op;	1796	op->below->above = op;
1871	where->inv = op;	1797	inv = op;
1872	}	1798	}
		1799
1873	return op;	1800	return op;
1874	}	1801	}
1875		1802
1876	/*	1803	/*
1877	* Checks if any objects has a move_type that matches objects	1804	* Checks if any objects has a move_type that matches objects
…		…
1895	*/	1822	*/
1896		1823
1897	int	1824	int
1898	check_move_on (object *op, object *originator)	1825	check_move_on (object *op, object *originator)
1899	{	1826	{
1900	object *	1827	object *tmp;
1901	tmp;	1828	maptile *m = op->map;
1902	tag_t
1903	tag;
1904	mapstruct *
1905	m = op->map;
1906	int
1907	x = op->x, y = op->y;	1829	int x = op->x, y = op->y;
1908		1830
1909	MoveType	1831	MoveType move_on, move_slow, move_block;
1910	move_on,
1911	move_slow,
1912	move_block;
1913		1832
1914	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1833	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1915	return 0;	1834	return 0;
1916
1917	tag = op->count;
1918		1835
1919	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);
1920	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);
1921	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);
1922		1839
…		…
1983	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1900	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1984	((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))
1985	{	1902	{
1986	move_apply (tmp, op, originator);	1903	move_apply (tmp, op, originator);
1987		1904
1988	if (was_destroyed (op, tag))	1905	if (op->destroyed ())
1989	return 1;	1906	return 1;
1990		1907
1991	/* what the person/creature stepped onto has moved the object	1908	/* what the person/creature stepped onto has moved the object
1992	* someplace new. Don't process any further - if we did,	1909	* someplace new. Don't process any further - if we did,
1993	* have a feeling strange problems would result.	1910	* have a feeling strange problems would result.
…		…
2005	* a matching archetype at the given map and coordinates.	1922	* a matching archetype at the given map and coordinates.
2006	* The first matching object is returned, or NULL if none.	1923	* The first matching object is returned, or NULL if none.
2007	*/	1924	*/
2008		1925
2009	object *	1926	object *
2010	present_arch (const archetype *at, mapstruct *m, int x, int y)	1927	present_arch (const archetype *at, maptile *m, int x, int y)
2011	{	1928	{
2012	object *	1929	object *
2013	tmp;	1930	tmp;
2014		1931
2015	if (m == NULL || out_of_map (m, x, y))	1932	if (m == NULL || out_of_map (m, x, y))
…		…
2028	* a matching type variable at the given map and coordinates.	1945	* a matching type variable at the given map and coordinates.
2029	* The first matching object is returned, or NULL if none.	1946	* The first matching object is returned, or NULL if none.
2030	*/	1947	*/
2031		1948
2032	object *	1949	object *
2033	present (unsigned char type, mapstruct *m, int x, int y)	1950	present (unsigned char type, maptile *m, int x, int y)
2034	{	1951	{
2035	object *	1952	object *
2036	tmp;	1953	tmp;
2037		1954
2038	if (out_of_map (m, x, y))	1955	if (out_of_map (m, x, y))
…		…
2178	* 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
2179	* customized, changed states, etc.	2096	* customized, changed states, etc.
2180	*/	2097	*/
2181		2098
2182	int	2099	int
2183	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)
2184	{	2101	{
2185	int	2102	int
2186	i,	2103	i,
2187	index = 0, flag;	2104	index = 0, flag;
2188	static int	2105	static int
…		…
2200	* 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
2201	* 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
2202	* to only the spaces immediately surrounding the target area, and	2119	* to only the spaces immediately surrounding the target area, and
2203	* won't look 2 spaces south of the target space.	2120	* won't look 2 spaces south of the target space.
2204	*/	2121	*/
2205	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2122	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2206	stop = maxfree[i];	2123	stop = maxfree[i];
2207	}	2124	}
		2125
2208	if (!index)	2126	if (!index)
2209	return -1;	2127	return -1;
		2128
2210	return altern[RANDOM () % index];	2129	return altern[RANDOM () % index];
2211	}	2130	}
2212		2131
2213	/*	2132	/*
2214	* find_first_free_spot(archetype, mapstruct, x, y) works like	2133	* find_first_free_spot(archetype, maptile, x, y) works like
2215	* find_free_spot(), but it will search max number of squares.	2134	* find_free_spot(), but it will search max number of squares.
2216	* 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.
2217	* 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.
2218	*/	2137	*/
2219		2138
2220	int	2139	int
2221	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)
2222	{	2141	{
2223	int	2142	int
2224	i;	2143	i;
2225		2144
2226	for (i = 0; i < SIZEOFFREE; i++)	2145	for (i = 0; i < SIZEOFFREE; i++)
…		…
2290	* 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
2291	* there is capable of.	2210	* there is capable of.
2292	*/	2211	*/
2293		2212
2294	int	2213	int
2295	find_dir (mapstruct *m, int x, int y, object *exclude)	2214	find_dir (maptile *m, int x, int y, object *exclude)
2296	{	2215	{
2297	int	2216	int
2298	i,	2217	i,
2299	max = SIZEOFFREE, mflags;	2218	max = SIZEOFFREE, mflags;
2300		2219
2301	sint16 nx, ny;	2220	sint16 nx, ny;
2302	object *	2221	object *
2303	tmp;	2222	tmp;
2304	mapstruct *	2223	maptile *
2305	mp;	2224	mp;
2306		2225
2307	MoveType blocked, move_type;	2226	MoveType blocked, move_type;
2308		2227
2309	if (exclude && exclude->head)	2228	if (exclude && exclude->head)
…		…
2517	* Modified to be map tile aware -.MSW	2436	* Modified to be map tile aware -.MSW
2518	*/	2437	*/
2519		2438
2520		2439
2521	int	2440	int
2522	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2441	can_see_monsterP (maptile *m, int x, int y, int dir)
2523	{	2442	{
2524	sint16 dx, dy;	2443	sint16 dx, dy;
2525	int	2444	int
2526	mflags;	2445	mflags;
2527		2446
…		…
2576	* create clone from object to another	2495	* create clone from object to another
2577	*/	2496	*/
2578	object *	2497	object *
2579	object_create_clone (object *asrc)	2498	object_create_clone (object *asrc)
2580	{	2499	{
2581	object *
2582	dst = NULL, *tmp, *src, *part, *prev, *item;	2500	object *dst = 0, *tmp, *src, *part, *prev, *item;
2583		2501
2584	if (!asrc)	2502	if (!asrc)
2585	return NULL;	2503	return 0;
		2504
2586	src = asrc;	2505	src = asrc;
2587	if (src->head)	2506	if (src->head)
2588	src = src->head;	2507	src = src->head;
2589		2508
2590	prev = NULL;	2509	prev = 0;
2591	for (part = src; part; part = part->more)	2510	for (part = src; part; part = part->more)
2592	{	2511	{
2593	tmp = get_object ();	2512	tmp = part->clone ();
2594	copy_object (part, tmp);
2595	tmp->x -= src->x;	2513	tmp->x -= src->x;
2596	tmp->y -= src->y;	2514	tmp->y -= src->y;
		2515
2597	if (!part->head)	2516	if (!part->head)
2598	{	2517	{
2599	dst = tmp;	2518	dst = tmp;
2600	tmp->head = NULL;	2519	tmp->head = 0;
2601	}	2520	}
2602	else	2521	else
2603	{	2522	{
2604	tmp->head = dst;	2523	tmp->head = dst;
2605	}	2524	}
		2525
2606	tmp->more = NULL;	2526	tmp->more = 0;
		2527
2607	if (prev)	2528	if (prev)
2608	prev->more = tmp;	2529	prev->more = tmp;
		2530
2609	prev = tmp;	2531	prev = tmp;
2610	}	2532	}
2611		2533
2612	/*** copy inventory ***/
2613	for (item = src->inv; item; item = item->below)	2534	for (item = src->inv; item; item = item->below)
2614	{
2615	(void) insert_ob_in_ob (object_create_clone (item), dst);	2535	insert_ob_in_ob (object_create_clone (item), dst);
2616	}
2617		2536
2618	return dst;	2537	return dst;
2619	}	2538	}
2620		2539
2621	/* return true if the object was destroyed, 0 otherwise */
2622	int
2623	was_destroyed (const object *op, tag_t old_tag)
2624	{
2625	/* checking for FLAG_FREED isn't necessary, but makes this function more
2626	* robust */
2627	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2628	}
2629
2630	/* GROS - Creates an object using a string representing its content. */	2540	/* GROS - Creates an object using a string representing its content. */
2631
2632	/* 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 */
2633
2634	/* 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, */
2635
2636	/* 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. */
2637
2638	/* 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. */
2639
2640	/* Also remember that multiparts objects are not supported for now. */	2545	/* Also remember that multiparts objects are not supported for now. */
2641		2546
2642	object *	2547	object *
2643	load_object_str (const char *obstr)	2548	load_object_str (const char *obstr)
2644	{	2549	{
2645	object *	2550	object *op;
2646	op;
2647	char
2648	filename[MAX_BUF];	2551	char filename[MAX_BUF];
2649		2552
2650	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2553	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2651		2554
2652	FILE *
2653	tempfile = fopen (filename, "w");	2555	FILE *tempfile = fopen (filename, "w");
2654		2556
2655	if (tempfile == NULL)	2557	if (tempfile == NULL)
2656	{	2558	{
2657	LOG (llevError, "Error - Unable to access load object temp file\n");	2559	LOG (llevError, "Error - Unable to access load object temp file\n");
2658	return NULL;	2560	return NULL;
2659	};	2561	}
		2562
2660	fprintf (tempfile, obstr);	2563	fprintf (tempfile, obstr);
2661	fclose (tempfile);	2564	fclose (tempfile);
2662		2565
2663	op = get_object ();	2566	op = object::create ();
2664		2567
2665	object_thawer thawer (filename);	2568	object_thawer thawer (filename);
2666		2569
2667	if (thawer)	2570	if (thawer)
2668	load_object (thawer, op, 0);	2571	load_object (thawer, op, 0);
…		…
2678	* returns NULL if no match.	2581	* returns NULL if no match.
2679	*/	2582	*/
2680	object *	2583	object *
2681	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)
2682	{	2585	{
2683	object *	2586	object *tmp;
2684	tmp;
2685		2587
2686	for (tmp = who->inv; tmp; tmp = tmp->below)	2588	for (tmp = who->inv; tmp; tmp = tmp->below)
2687	if (tmp->type == type && tmp->subtype == subtype)	2589	if (tmp->type == type && tmp->subtype == subtype)
2688	return tmp;	2590	return tmp;
2689		2591
…		…
2697	* do the desired thing.	2599	* do the desired thing.
2698	*/	2600	*/
2699	key_value *	2601	key_value *
2700	get_ob_key_link (const object *ob, const char *key)	2602	get_ob_key_link (const object *ob, const char *key)
2701	{	2603	{
2702	key_value *	2604	key_value *link;
2703	link;
2704		2605
2705	for (link = ob->key_values; link != NULL; link = link->next)	2606	for (link = ob->key_values; link != NULL; link = link->next)
2706	{
2707	if (link->key == key)	2607	if (link->key == key)
2708	{
2709	return link;	2608	return link;
2710	}
2711	}
2712		2609
2713	return NULL;	2610	return NULL;
2714	}	2611	}
2715		2612
2716	/*	2613	/*
…		…
2721	* The returned string is shared.	2618	* The returned string is shared.
2722	*/	2619	*/
2723	const char *	2620	const char *
2724	get_ob_key_value (const object *op, const char *const key)	2621	get_ob_key_value (const object *op, const char *const key)
2725	{	2622	{
2726	key_value *	2623	key_value *link;
2727	link;	2624	shstr_cmp canonical_key (key);
2728	const char *
2729	canonical_key;
2730		2625
2731	canonical_key = shstr::find (key);
2732
2733	if (canonical_key == NULL)	2626	if (!canonical_key)
2734	{	2627	{
2735	/* 1. There being a field named key on any object	2628	/* 1. There being a field named key on any object
2736	* implies there'd be a shared string to find.	2629	* implies there'd be a shared string to find.
2737	* 2. Since there isn't, no object has this field.	2630	* 2. Since there isn't, no object has this field.
2738	* 3. Therefore, *this* object doesn't have this field.	2631	* 3. Therefore, *this* object doesn't have this field.
2739	*/	2632	*/
2740	return NULL;	2633	return 0;
2741	}	2634	}
2742		2635
2743	/* This is copied from get_ob_key_link() above -	2636	/* This is copied from get_ob_key_link() above -
2744	* only 4 lines, and saves the function call overhead.	2637	* only 4 lines, and saves the function call overhead.
2745	*/	2638	*/
2746	for (link = op->key_values; link != NULL; link = link->next)	2639	for (link = op->key_values; link; link = link->next)
2747	{
2748	if (link->key == canonical_key)	2640	if (link->key == canonical_key)
2749	{
2750	return link->value;	2641	return link->value;
2751	}	2642
2752	}
2753	return NULL;	2643	return 0;
2754	}	2644	}
2755		2645
2756		2646
2757	/*	2647	/*
2758	* Updates the canonical_key in op to value.	2648	* Updates the canonical_key in op to value.
…		…
2844	shstr key_ (key);	2734	shstr key_ (key);
2845		2735
2846	return set_ob_key_value_s (op, key_, value, add_key);	2736	return set_ob_key_value_s (op, key_, value, add_key);
2847	}	2737	}
2848		2738
		2739	object::depth_iterator::depth_iterator (object *container)
		2740	: iterator_base (container)
		2741	{
		2742	while (item->inv)
		2743	item = item->inv;
		2744	}
		2745
2849	void	2746	void
2850	object::deep_iterator::next ()	2747	object::depth_iterator::next ()
2851	{	2748	{
2852	if (item->inv)
2853	item = item->inv;
2854	else if (item->below)	2749	if (item->below)
		2750	{
2855	item = item->below;	2751	item = item->below;
		2752
		2753	while (item->inv)
		2754	item = item->inv;
		2755	}
2856	else	2756	else
2857	item = item->env->below;	2757	item = item->env;
2858	}	2758	}
		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