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.28 by root, Mon Sep 11 12:10:21 2006 UTC vs.
Revision 1.78 by root, Fri Dec 22 16:34:00 2006 UTC

…		…
16		16
17	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
18	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		20
21	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>
22	*/	22	*/
23		23
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
26	variable. */	26	variable. */
…		…
28	#include <stdio.h>	28	#include <stdio.h>
29	#include <sys/types.h>	29	#include <sys/types.h>
30	#include <sys/uio.h>	30	#include <sys/uio.h>
31	#include <object.h>	31	#include <object.h>
32	#include <funcpoint.h>	32	#include <funcpoint.h>
33	#include <skills.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	*/
…		…
207	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	282	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)
208	return 0;	283	return 0;
209		284
210	switch (ob1->type)	285	switch (ob1->type)
211	{	286	{
212	case SCROLL:	287	case SCROLL:
213	if (ob1->level != ob2->level)	288	if (ob1->level != ob2->level)
214	return 0;	289	return 0;
215	break;	290	break;
216	}	291	}
217		292
218	if (ob1->key_values != NULL || ob2->key_values != NULL)	293	if (ob1->key_values != NULL || ob2->key_values != NULL)
219	{	294	{
220	/* At least one of these has key_values. */	295	/* At least one of these has key_values. */
…		…
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
…		…
433	{	428	{
434	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	429	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
435	}	430	}
436		431
437	/*	432	/*
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
448	object *
449	get_owner (object *op)
450	{
451	if (op->owner == NULL)
452	return NULL;
453
454	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
455	return op->owner;
456
457	op->owner = NULL;
458	op->ownercount = 0;
459	return NULL;
460	}
461
462	void
463	clear_owner (object *op)
464	{
465	if (!op)
466	return;
467
468	if (op->owner && op->ownercount == op->owner->count)
469	op->owner->refcount--;
470
471	op->owner = NULL;
472	op->ownercount = 0;
473	}
474
475	/*
476	* 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
477	* skill and experience objects.	434	* skill and experience objects.
478	*/	435	*/
479	void	436	void
480	set_owner (object *op, object *owner)	437	object::set_owner (object *owner)
481	{	438	{
482	if (owner == NULL || op == NULL)	439	if (!owner)
483	return;	440	return;
484		441
485	/* next line added to allow objects which own objects */	442	/* next line added to allow objects which own objects */
486	/* Add a check for ownercounts in here, as I got into an endless loop	443	/* Add a check for ownercounts in here, as I got into an endless loop
487	* with the fireball owning a poison cloud which then owned the	444	* with the fireball owning a poison cloud which then owned the
488	* fireball. I believe that was caused by one of the objects getting	445	* fireball. I believe that was caused by one of the objects getting
489	* freed and then another object replacing it. Since the ownercounts	446	* freed and then another object replacing it. Since the ownercounts
490	* didn't match, this check is valid and I believe that cause is valid.	447	* didn't match, this check is valid and I believe that cause is valid.
491	*/	448	*/
492	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	449	while (owner->owner)
493	owner = owner->owner;	450	owner = owner->owner;
494		451
495	/* IF the owner still has an owner, we did not resolve to a final owner.
496	* so lets not add to that.
497	*/
498	if (owner->owner)
499	return;
500
501	op->owner = owner;	452	this->owner = owner;
502
503	op->ownercount = owner->count;
504	owner->refcount++;
505	}
506
507	/* Set the owner to clone's current owner and set the skill and experience
508	* objects to clone's objects (typically those objects that where the owner's
509	* current skill and experience objects at the time when clone's owner was
510	* set - not the owner's current skill and experience objects).
511	*
512	* Use this function if player created an object (e.g. fire bullet, swarm
513	* spell), and this object creates further objects whose kills should be
514	* accounted for the player's original skill, even if player has changed
515	* skills meanwhile.
516	*/
517	void
518	copy_owner (object *op, object *clone)
519	{
520	object *owner = get_owner (clone);
521
522	if (owner == NULL)
523	{
524	/* players don't have owners - they own themselves. Update
525	* as appropriate.
526	*/
527	if (clone->type == PLAYER)
528	owner = clone;
529	else
530	return;
531	}
532
533	set_owner (op, owner);
534	}	453	}
535		454
536	/* Zero the key_values on op, decrementing the shared-string	455	/* Zero the key_values on op, decrementing the shared-string
537	* refcounts and freeing the links.	456	* refcounts and freeing the links.
538	*/	457	*/
…		…
548	}	467	}
549		468
550	op->key_values = 0;	469	op->key_values = 0;
551	}	470	}
552		471
553	void object::clear ()
554	{
555	attachable_base::clear ();
556
557	free_key_values (this);
558
559	clear_owner (this);
560
561	name = 0;
562	name_pl = 0;
563	title = 0;
564	race = 0;
565	slaying = 0;
566	skill = 0;
567	msg = 0;
568	lore = 0;
569	custom_name = 0;
570	materialname = 0;
571
572	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));
573
574	SET_FLAG (this, FLAG_REMOVED);
575	}
576
577	void object::clone (object *destination)
578	{
579	*(object_copy *) destination = *this;
580	*(object_pod *) destination = *this;
581
582	if (self || cb)
583	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
584	}
585
586	/*	472	/*
587	* clear_object() frees everything allocated by an object, and also
588	* clears all variables and flags to default settings.
589	*/
590
591	void
592	clear_object (object *op)
593	{
594	op->clear ();
595
596	op->contr = NULL;
597	op->below = NULL;
598	op->above = NULL;
599	op->inv = NULL;
600	op->container = NULL;
601	op->env = NULL;
602	op->more = NULL;
603	op->head = NULL;
604	op->map = NULL;
605	op->refcount = 0;
606	op->active_next = NULL;
607	op->active_prev = NULL;
608	/* What is not cleared is next, prev, and count */
609
610	op->expmul = 1.0;
611	op->face = blank_face;
612	op->attacked_by_count = -1;
613
614	if (settings.casting_time)
615	op->casting_time = -1;
616	}
617
618	/*
619	* copy object first frees everything allocated by the second object,	473	* copy_to first frees everything allocated by the dst object,
620	* and then copies the contends of the first object into the second	474	* and then copies the contents of itself into the second
621	* object, allocating what needs to be allocated. Basically, any	475	* object, allocating what needs to be allocated. Basically, any
622	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	476	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
623	* if the first object is freed, the pointers in the new object	477	* if the first object is freed, the pointers in the new object
624	* will point at garbage.	478	* will point at garbage.
625	*/	479	*/
626
627	void	480	void
628	copy_object (object *op2, object *op)	481	object::copy_to (object *dst)
629	{	482	{
630	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
631	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
632		485
633	op2->clone (op);	486	*(object_copy *)dst = *this;
		487	*(object_pod *)dst = *this;
		488
		489	if (self || cb)
		490	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
634		491
635	if (is_freed)	492	if (is_freed)
636	SET_FLAG (op, FLAG_FREED);	493	SET_FLAG (dst, FLAG_FREED);
		494
637	if (is_removed)	495	if (is_removed)
638	SET_FLAG (op, FLAG_REMOVED);	496	SET_FLAG (dst, FLAG_REMOVED);
639		497
640	if (op2->speed < 0)	498	if (speed < 0)
641	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	499	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
642		500
643	/* Copy over key_values, if any. */	501	/* Copy over key_values, if any. */
644	if (op2->key_values)	502	if (key_values)
645	{	503	{
646	key_value *tail = 0;	504	key_value *tail = 0;
647	key_value *i;	505	key_value *i;
648		506
649	op->key_values = 0;	507	dst->key_values = 0;
650		508
651	for (i = op2->key_values; i; i = i->next)	509	for (i = key_values; i; i = i->next)
652	{	510	{
653	key_value *new_link = new key_value;	511	key_value *new_link = new key_value;
654		512
655	new_link->next = 0;	513	new_link->next = 0;
656	new_link->key = i->key;	514	new_link->key = i->key;
657	new_link->value = i->value;	515	new_link->value = i->value;
658		516
659	/* Try and be clever here, too. */	517	/* Try and be clever here, too. */
660	if (!op->key_values)	518	if (!dst->key_values)
661	{	519	{
662	op->key_values = new_link;	520	dst->key_values = new_link;
663	tail = new_link;	521	tail = new_link;
664	}	522	}
665	else	523	else
666	{	524	{
667	tail->next = new_link;	525	tail->next = new_link;
668	tail = new_link;	526	tail = new_link;
669	}	527	}
670	}	528	}
671	}	529	}
672		530
673	update_ob_speed (op);	531	update_ob_speed (dst);
		532	}
		533
		534	object *
		535	object::clone ()
		536	{
		537	object *neu = create ();
		538	copy_to (neu);
		539	return neu;
674	}	540	}
675		541
676	/*	542	/*
677	* If an object with the IS_TURNABLE() flag needs to be turned due	543	* If an object with the IS_TURNABLE() flag needs to be turned due
678	* to the closest player being on the other side, this function can	544	* to the closest player being on the other side, this function can
…		…
691	/*	557	/*
692	* Updates the speed of an object. If the speed changes from 0 to another	558	* Updates the speed of an object. If the speed changes from 0 to another
693	* value, or vice versa, then add/remove the object from the active list.	559	* value, or vice versa, then add/remove the object from the active list.
694	* This function needs to be called whenever the speed of an object changes.	560	* This function needs to be called whenever the speed of an object changes.
695	*/	561	*/
696
697	void	562	void
698	update_ob_speed (object *op)	563	update_ob_speed (object *op)
699	{	564	{
700	extern int arch_init;	565	extern int arch_init;
701		566
…		…
710	abort ();	575	abort ();
711	#else	576	#else
712	op->speed = 0;	577	op->speed = 0;
713	#endif	578	#endif
714	}	579	}
		580
715	if (arch_init)	581	if (arch_init)
716	{
717	return;	582	return;
718	}	583
719	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	584	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
720	{	585	{
721	/* If already on active list, don't do anything */	586	/* If already on active list, don't do anything */
722	if (op->active_next || op->active_prev || op == active_objects)	587	if (op->active_next || op->active_prev || op == active_objects)
723	return;	588	return;
724		589
725	/* process_events() expects us to insert the object at the beginning	590	/* process_events() expects us to insert the object at the beginning
726	* of the list. */	591	* of the list. */
727	op->active_next = active_objects;	592	op->active_next = active_objects;
		593
728	if (op->active_next != NULL)	594	if (op->active_next != NULL)
729	op->active_next->active_prev = op;	595	op->active_next->active_prev = op;
		596
730	active_objects = op;	597	active_objects = op;
731	}	598	}
732	else	599	else
733	{	600	{
734	/* If not on the active list, nothing needs to be done */	601	/* If not on the active list, nothing needs to be done */
…		…
736	return;	603	return;
737		604
738	if (op->active_prev == NULL)	605	if (op->active_prev == NULL)
739	{	606	{
740	active_objects = op->active_next;	607	active_objects = op->active_next;
		608
741	if (op->active_next != NULL)	609	if (op->active_next != NULL)
742	op->active_next->active_prev = NULL;	610	op->active_next->active_prev = NULL;
743	}	611	}
744	else	612	else
745	{	613	{
746	op->active_prev->active_next = op->active_next;	614	op->active_prev->active_next = op->active_next;
		615
747	if (op->active_next)	616	if (op->active_next)
748	op->active_next->active_prev = op->active_prev;	617	op->active_next->active_prev = op->active_prev;
749	}	618	}
		619
750	op->active_next = NULL;	620	op->active_next = NULL;
751	op->active_prev = NULL;	621	op->active_prev = NULL;
752	}	622	}
753	}	623	}
754		624
…		…
782	op->active_next = NULL;	652	op->active_next = NULL;
783	op->active_prev = NULL;	653	op->active_prev = NULL;
784	}	654	}
785		655
786	/*	656	/*
787	* update_object() updates the array which represents the map.	657	* update_object() updates the the map.
788	* It takes into account invisible objects (and represent squares covered	658	* It takes into account invisible objects (and represent squares covered
789	* by invisible objects by whatever is below them (unless it's another	659	* by invisible objects by whatever is below them (unless it's another
790	* invisible object, etc...)	660	* invisible object, etc...)
791	* If the object being updated is beneath a player, the look-window	661	* If the object being updated is beneath a player, the look-window
792	* of that player is updated (this might be a suboptimal way of	662	* of that player is updated (this might be a suboptimal way of
793	* updating that window, though, since update_object() is called _often_)	663	* updating that window, though, since update_object() is called _often_)
794	*	664	*
795	* action is a hint of what the caller believes need to be done.	665	* action is a hint of what the caller believes need to be done.
796	* For example, if the only thing that has changed is the face (due to
797	* an animation), we don't need to call update_position until that actually
798	* comes into view of a player. OTOH, many other things, like addition/removal
799	* of walls or living creatures may need us to update the flags now.
800	* current action are:	666	* current action are:
801	* UP_OBJ_INSERT: op was inserted	667	* UP_OBJ_INSERT: op was inserted
802	* UP_OBJ_REMOVE: op was removed	668	* UP_OBJ_REMOVE: op was removed
803	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	669	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
804	* as that is easier than trying to look at what may have changed.	670	* as that is easier than trying to look at what may have changed.
805	* UP_OBJ_FACE: only the objects face has changed.	671	* UP_OBJ_FACE: only the objects face has changed.
806	*/	672	*/
807
808	void	673	void
809	update_object (object *op, int action)	674	update_object (object *op, int action)
810	{	675	{
811	int update_now = 0, flags;
812	MoveType move_on, move_off, move_block, move_slow;	676	MoveType move_on, move_off, move_block, move_slow;
813		677
814	if (op == NULL)	678	if (op == NULL)
815	{	679	{
816	/* this should never happen */	680	/* this should never happen */
817	LOG (llevDebug, "update_object() called for NULL object.\n");	681	LOG (llevDebug, "update_object() called for NULL object.\n");
818	return;	682	return;
819	}	683	}
820		684
821	if (op->env != NULL)	685	if (op->env)
822	{	686	{
823	/* Animation is currently handled by client, so nothing	687	/* Animation is currently handled by client, so nothing
824	* to do in this case.	688	* to do in this case.
825	*/	689	*/
826	return;	690	return;
…		…
840	abort ();	704	abort ();
841	#endif	705	#endif
842	return;	706	return;
843	}	707	}
844		708
845	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	709	mapspace &m = op->ms ();
846	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
847	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
848	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
849	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
850	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
851		710
		711	if (m.flags_ & P_NEED_UPDATE)
		712	/* nop */;
852	if (action == UP_OBJ_INSERT)	713	else if (action == UP_OBJ_INSERT)
853	{	714	{
		715	// this is likely overkill, TODO: revisit (schmorp)
854	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	716	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
855	update_now = 1;
856
857	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	717	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
858	update_now = 1;	718	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
859		719	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		720	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
860	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	721	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
861	update_now = 1;
862
863	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
864	update_now = 1;
865
866	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
867	update_now = 1;
868
869	if ((move_on | op->move_on) != move_on)	722	|| (m.move_on | op->move_on ) != m.move_on
870	update_now = 1;
871
872	if ((move_off | op->move_off) != move_off)	723	|| (m.move_off | op->move_off ) != m.move_off
873	update_now = 1;	724	|| (m.move_slow | op->move_slow) != m.move_slow
874
875	/* This isn't perfect, but I don't expect a lot of objects to	725	/* This isn't perfect, but I don't expect a lot of objects to
876	* to have move_allow right now.	726	* to have move_allow right now.
877	*/	727	*/
878	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	728	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
879	update_now = 1;	729	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
880		730	m.flags_ = P_NEED_UPDATE;
881	if ((move_slow | op->move_slow) != move_slow)
882	update_now = 1;
883	}	731	}
884	/* if the object is being removed, we can't make intelligent	732	/* if the object is being removed, we can't make intelligent
885	* decisions, because remove_ob can't really pass the object	733	* decisions, because remove_ob can't really pass the object
886	* that is being removed.	734	* that is being removed.
887	*/	735	*/
888	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	736	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
889	update_now = 1;	737	m.flags_ = P_NEED_UPDATE;
890	else if (action == UP_OBJ_FACE)	738	else if (action == UP_OBJ_FACE)
891	/* Nothing to do for that case */;	739	/* Nothing to do for that case */ ;
892	else	740	else
893	LOG (llevError, "update_object called with invalid action: %d\n", action);	741	LOG (llevError, "update_object called with invalid action: %d\n", action);
894		742
895	if (update_now)
896	{
897	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
898	update_position (op->map, op->x, op->y);
899	}
900
901	if (op->more != NULL)	743	if (op->more)
902	update_object (op->more, action);	744	update_object (op->more, action);
903	}	745	}
904		746
905	static unordered_vector<object *> mortals;	747	object::vector object::mortals;
906	static std::vector<object *> freed;	748	object::vector object::objects; // not yet used
		749	object *object::first;
907		750
908	void object::free_mortals ()	751	void object::free_mortals ()
909	{	752	{
910	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	753	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
911	if (!(*i)->refcount)	754	if ((*i)->refcnt)
		755	++i; // further delay freeing
		756	else
912	{	757	{
913	freed.push_back (*i);	758	delete *i;
914	mortals.erase (i);	759	mortals.erase (i);
915	}	760	}
916	else
917	++i;
918	}	761	}
919		762
920	object::object ()	763	object::object ()
921	{	764	{
922	SET_FLAG (this, FLAG_REMOVED);	765	SET_FLAG (this, FLAG_REMOVED);
923		766
924	expmul = 1.0;	767	expmul = 1.0;
925	face = blank_face;	768	face = blank_face;
926	attacked_by_count = -1;
927	}	769	}
928		770
929	object::~object ()	771	object::~object ()
930	{	772	{
931	free_key_values (this);	773	free_key_values (this);
932	}	774	}
933		775
934	void object::link ()	776	void object::link ()
935	{	777	{
936	count = ++ob_count;	778	count = ++ob_count;
		779	uuid = gen_uuid ();
937		780
938	prev = 0;	781	prev = 0;
939	next = objects;	782	next = object::first;
940		783
941	if (objects)	784	if (object::first)
942	objects->prev = this;	785	object::first->prev = this;
943		786
944	objects = this;	787	object::first = this;
945	}	788	}
946		789
947	void object::unlink ()	790	void object::unlink ()
948	{	791	{
949	count = 0;	792	if (this == object::first)
		793	object::first = next;
950		794
951	/* Remove this object from the list of used objects */	795	/* Remove this object from the list of used objects */
952	if (prev)
953	{
954	prev->next = next;	796	if (prev) prev->next = next;
		797	if (next) next->prev = prev;
		798
955	prev = 0;	799	prev = 0;
956	}
957
958	if (next)
959	{
960	next->prev = prev;
961	next = 0;	800	next = 0;
962	}
963
964	if (this == objects)
965	objects = next;
966	}	801	}
967		802
968	object *object::create ()	803	object *object::create ()
969	{	804	{
970	object *op;
971
972	if (freed.empty ())
973	op = new object;	805	object *op = new object;
974	else
975	{
976	// highly annoying, but the only way to get it stable right now
977	op = freed.back (); freed.pop_back ();
978	op->~object ();
979	new ((void *)op) object;
980	}
981
982	op->link ();	806	op->link ();
983	return op;	807	return op;
984	}	808	}
985		809
986	/*	810	/*
…		…
988	* it from the list of used objects, and puts it on the list of	812	* it from the list of used objects, and puts it on the list of
989	* free objects. The IS_FREED() flag is set in the object.	813	* free objects. The IS_FREED() flag is set in the object.
990	* The object must have been removed by remove_ob() first for	814	* The object must have been removed by remove_ob() first for
991	* this function to succeed.	815	* this function to succeed.
992	*	816	*
993	* If free_inventory is set, free inventory as well. Else drop items in	817	* If destroy_inventory is set, free inventory as well. Else drop items in
994	* inventory to the ground.	818	* inventory to the ground.
995	*/	819	*/
996	void object::free (bool free_inventory)	820	void object::destroy (bool destroy_inventory)
997	{	821	{
		822	if (QUERY_FLAG (this, FLAG_FREED))
		823	return;
		824
		825	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		826	remove_friendly_object (this);
		827
998	if (!QUERY_FLAG (this, FLAG_REMOVED))	828	if (!QUERY_FLAG (this, FLAG_REMOVED))
999	{	829	remove ();
1000	LOG (llevDebug, "Free object called with non removed object\n");
1001	dump_object (this);
1002	#ifdef MANY_CORES
1003	abort ();
1004	#endif
1005	}
1006		830
1007	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1008	{
1009	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1010	remove_friendly_object (this);
1011	}
1012
1013	if (QUERY_FLAG (this, FLAG_FREED))	831	SET_FLAG (this, FLAG_FREED);
1014	{
1015	dump_object (this);
1016	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1017	return;
1018	}
1019		832
1020	if (more)	833	if (more)
1021	{	834	{
1022	more->free (free_inventory);	835	more->destroy (destroy_inventory);
1023	more = 0;	836	more = 0;
1024	}	837	}
1025		838
1026	if (inv)	839	if (inv)
1027	{	840	{
1028	/* Only if the space blocks everything do we not process -	841	/* Only if the space blocks everything do we not process -
1029	* if some form of movement is allowed, let objects	842	* if some form of movement is allowed, let objects
1030	* drop on that space.	843	* drop on that space.
1031	*/	844	*/
1032	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	845	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1033	{	846	{
1034	object *	847	object *op = inv;
1035	op = inv;
1036		848
1037	while (op)	849	while (op)
1038	{	850	{
1039	object *
1040	tmp = op->below;	851	object *tmp = op->below;
1041
1042	remove_ob (op);
1043	op->free (free_inventory);	852	op->destroy (destroy_inventory);
1044	op = tmp;	853	op = tmp;
1045	}	854	}
1046	}	855	}
1047	else	856	else
1048	{ /* Put objects in inventory onto this space */	857	{ /* Put objects in inventory onto this space */
1049	object *	858	object *op = inv;
1050	op = inv;
1051		859
1052	while (op)	860	while (op)
1053	{	861	{
1054	object *
1055	tmp = op->below;	862	object *tmp = op->below;
1056		863
1057	remove_ob (op);	864	op->remove ();
1058		865
1059	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	866	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1060	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	867	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1061	free_object (op);	868	op->destroy ();
1062	else	869	else
1063	{	870	{
1064	op->x = x;	871	op->x = x;
1065	op->y = y;	872	op->y = y;
1066	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	873	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
1069	op = tmp;	876	op = tmp;
1070	}	877	}
1071	}	878	}
1072	}	879	}
1073		880
1074	clear_owner (this);	881	// hack to ensure that freed objects still have a valid map
		882	{
		883	static maptile *freed_map; // freed objects are moved here to avoid crashes
		884
		885	if (!freed_map)
		886	{
		887	freed_map = new maptile;
		888
		889	freed_map->name = "/internal/freed_objects_map";
		890	freed_map->width = 3;
		891	freed_map->height = 3;
		892
		893	freed_map->allocate ();
		894	}
		895
		896	map = freed_map;
		897	x = 1;
		898	y = 1;
		899	}
		900
		901	// clear those pointers that likely might have circular references to us
		902	owner = 0;
		903	enemy = 0;
		904	attacked_by = 0;
		905
		906	// only relevant for players(?), but make sure of it anyways
		907	contr = 0;
1075		908
1076	/* Remove object from the active list */	909	/* Remove object from the active list */
1077	speed = 0;	910	speed = 0;
1078	update_ob_speed (this);	911	update_ob_speed (this);
1079		912
1080	unlink ();	913	unlink ();
1081		914
1082	SET_FLAG (this, FLAG_FREED);
1083
1084	mortals.push_back (this);	915	mortals.push_back (this);
1085	}	916	}
1086		917
1087	/*	918	/*
1088	* sub_weight() recursively (outwards) subtracts a number from the	919	* sub_weight() recursively (outwards) subtracts a number from the
1089	* weight of an object (and what is carried by it's environment(s)).	920	* weight of an object (and what is carried by it's environment(s)).
1090	*/	921	*/
1091
1092	void	922	void
1093	sub_weight (object *op, signed long weight)	923	sub_weight (object *op, signed long weight)
1094	{	924	{
1095	while (op != NULL)	925	while (op != NULL)
1096	{	926	{
1097	if (op->type == CONTAINER)	927	if (op->type == CONTAINER)
1098	{
1099	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	928	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1100	}	929
1101	op->carrying -= weight;	930	op->carrying -= weight;
1102	op = op->env;	931	op = op->env;
1103	}	932	}
1104	}	933	}
1105		934
1106	/* remove_ob(op):	935	/* op->remove ():
1107	* This function removes the object op from the linked list of objects	936	* This function removes the object op from the linked list of objects
1108	* which it is currently tied to. When this function is done, the	937	* which it is currently tied to. When this function is done, the
1109	* object will have no environment. If the object previously had an	938	* object will have no environment. If the object previously had an
1110	* environment, the x and y coordinates will be updated to	939	* environment, the x and y coordinates will be updated to
1111	* the previous environment.	940	* the previous environment.
1112	* Beware: This function is called from the editor as well!	941	* Beware: This function is called from the editor as well!
1113	*/	942	*/
1114
1115	void	943	void
1116	remove_ob (object *op)	944	object::remove ()
1117	{	945	{
1118	object *tmp, *last = NULL;	946	object *tmp, *last = 0;
1119	object *otmp;	947	object *otmp;
1120		948
1121	tag_t tag;
1122	int check_walk_off;	949	int check_walk_off;
1123	mapstruct *m;
1124		950
1125	sint16 x, y;
1126
1127	if (QUERY_FLAG (op, FLAG_REMOVED))	951	if (QUERY_FLAG (this, FLAG_REMOVED))
1128	{	952	return;
1129	dump_object (op);
1130	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1131		953
1132	/* Changed it to always dump core in this case. As has been learned
1133	* in the past, trying to recover from errors almost always
1134	* make things worse, and this is a real error here - something
1135	* that should not happen.
1136	* Yes, if this was a mission critical app, trying to do something
1137	* to recover may make sense, but that is because failure of the app
1138	* may have other disastrous problems. Cf runs out of a script
1139	* so is easily enough restarted without any real problems.
1140	* MSW 2001-07-01
1141	*/
1142	abort ();
1143	}
1144
1145	if (op->more != NULL)
1146	remove_ob (op->more);
1147
1148	SET_FLAG (op, FLAG_REMOVED);	954	SET_FLAG (this, FLAG_REMOVED);
		955
		956	if (more)
		957	more->remove ();
1149		958
1150	/*	959	/*
1151	* In this case, the object to be removed is in someones	960	* In this case, the object to be removed is in someones
1152	* inventory.	961	* inventory.
1153	*/	962	*/
1154	if (op->env != NULL)	963	if (env)
1155	{	964	{
1156	if (op->nrof)	965	if (nrof)
1157	sub_weight (op->env, op->weight * op->nrof);	966	sub_weight (env, weight * nrof);
1158	else	967	else
1159	sub_weight (op->env, op->weight + op->carrying);	968	sub_weight (env, weight + carrying);
1160		969
1161	/* NO_FIX_PLAYER is set when a great many changes are being	970	/* NO_FIX_PLAYER is set when a great many changes are being
1162	* made to players inventory. If set, avoiding the call	971	* made to players inventory. If set, avoiding the call
1163	* to save cpu time.	972	* to save cpu time.
1164	*/	973	*/
1165	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	974	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1166	fix_player (otmp);	975	otmp->update_stats ();
1167		976
1168	if (op->above != NULL)	977	if (above != NULL)
1169	op->above->below = op->below;	978	above->below = below;
1170	else	979	else
1171	op->env->inv = op->below;	980	env->inv = below;
1172		981
1173	if (op->below != NULL)	982	if (below != NULL)
1174	op->below->above = op->above;	983	below->above = above;
1175		984
1176	/* we set up values so that it could be inserted into	985	/* we set up values so that it could be inserted into
1177	* the map, but we don't actually do that - it is up	986	* the map, but we don't actually do that - it is up
1178	* to the caller to decide what we want to do.	987	* to the caller to decide what we want to do.
1179	*/	988	*/
1180	op->x = op->env->x, op->y = op->env->y;	989	x = env->x, y = env->y;
1181	op->map = op->env->map;	990	map = env->map;
1182	op->above = NULL, op->below = NULL;	991	above = 0, below = 0;
1183	op->env = NULL;	992	env = 0;
1184	return;
1185	}
1186
1187	/* If we get here, we are removing it from a map */
1188	if (op->map == NULL)
1189	return;
1190
1191	x = op->x;
1192	y = op->y;
1193	m = get_map_from_coord (op->map, &x, &y);
1194
1195	if (!m)
1196	{	993	}
1197	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	994	else if (map)
1198	op->map->path, op->x, op->y);	995	{
1199	/* in old days, we used to set x and y to 0 and continue.	996	/* Re did the following section of code - it looks like it had
1200	* it seems if we get into this case, something is probablye	997	* lots of logic for things we no longer care about
1201	* screwed up and should be fixed.
1202	*/	998	*/
1203	abort ();
1204	}
1205	if (op->map != m)
1206	{
1207	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1208	op->map->path, m->path, op->x, op->y, x, y);
1209	}
1210		999
1211	/* Re did the following section of code - it looks like it had
1212	* lots of logic for things we no longer care about
1213	*/
1214
1215	/* link the object above us */	1000	/* link the object above us */
1216	if (op->above)	1001	if (above)
1217	op->above->below = op->below;	1002	above->below = below;
1218	else	1003	else
1219	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1004	map->at (x, y).top = below; /* we were top, set new top */
1220		1005
1221	/* Relink the object below us, if there is one */	1006	/* Relink the object below us, if there is one */
1222	if (op->below)	1007	if (below)
1223	op->below->above = op->above;	1008	below->above = above;
1224	else	1009	else
1225	{
1226	/* Nothing below, which means we need to relink map object for this space
1227	* use translated coordinates in case some oddness with map tiling is
1228	* evident
1229	*/
1230	if (GET_MAP_OB (m, x, y) != op)
1231	{	1010	{
1232	dump_object (op);	1011	/* Nothing below, which means we need to relink map object for this space
		1012	* use translated coordinates in case some oddness with map tiling is
		1013	* evident
		1014	*/
		1015	if (GET_MAP_OB (map, x, y) != this)
		1016	{
		1017	char *dump = dump_object (this);
		1018	LOG (llevError,
1233	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n",	1019	"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);
1234	errmsg);	1020	free (dump);
1235	dump_object (GET_MAP_OB (m, x, y));	1021	dump = dump_object (GET_MAP_OB (map, x, y));
1236	LOG (llevError, "%s\n", errmsg);	1022	LOG (llevError, "%s\n", dump);
		1023	free (dump);
1237	}	1024	}
1238		1025
1239	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1026	map->at (x, y).bottom = above; /* goes on above it. */
1240	}	1027	}
1241		1028
1242	op->above = NULL;	1029	above = 0;
1243	op->below = NULL;	1030	below = 0;
1244		1031
1245	if (op->map->in_memory == MAP_SAVING)	1032	if (map->in_memory == MAP_SAVING)
1246	return;	1033	return;
1247		1034
1248	tag = op->count;
1249	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1035	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1250		1036
1251	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1037	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1252	{
1253	/* No point updating the players look faces if he is the object
1254	* being removed.
1255	*/
1256
1257	if (tmp->type == PLAYER && tmp != op)
1258	{	1038	{
1259	/* If a container that the player is currently using somehow gets	1039	/* No point updating the players look faces if he is the object
1260	* removed (most likely destroyed), update the player view	1040	* being removed.
1261	* appropriately.
1262	*/	1041	*/
1263	if (tmp->container == op)	1042
		1043	if (tmp->type == PLAYER && tmp != this)
1264	{	1044	{
		1045	/* If a container that the player is currently using somehow gets
		1046	* removed (most likely destroyed), update the player view
		1047	* appropriately.
		1048	*/
		1049	if (tmp->container == this)
		1050	{
1265	CLEAR_FLAG (op, FLAG_APPLIED);	1051	CLEAR_FLAG (this, FLAG_APPLIED);
1266	tmp->container = NULL;	1052	tmp->container = 0;
		1053	}
		1054
		1055	tmp->contr->ns->floorbox_update ();
1267	}	1056	}
1268		1057
1269	tmp->contr->socket.update_look = 1;
1270	}
1271	/* See if player moving off should effect something */	1058	/* See if player moving off should effect something */
1272	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1059	if (check_walk_off
1273	{	1060	&& ((move_type & tmp->move_off)
1274	move_apply (tmp, op, NULL);	1061	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1275
1276	if (was_destroyed (op, tag))
1277	{	1062	{
		1063	move_apply (tmp, this, 0);
		1064
		1065	if (destroyed ())
1278	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1066	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1279	}	1067	}
1280	}
1281		1068
1282	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1069	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1283		1070
1284	if (tmp->above == tmp)	1071	if (tmp->above == tmp)
1285	tmp->above = NULL;	1072	tmp->above = 0;
1286		1073
1287	last = tmp;	1074	last = tmp;
1288	}	1075	}
1289		1076
1290	/* last == NULL of there are no objects on this space */	1077	/* last == NULL of there are no objects on this space */
1291	if (last == NULL)	1078	if (!last)
1292	{	1079	map->at (x, y).flags_ = P_NEED_UPDATE;
1293	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1294	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1295	* those out anyways, and if there are any flags set right now, they won't
1296	* be correct anyways.
1297	*/
1298	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1299	update_position (op->map, op->x, op->y);
1300	}
1301	else	1080	else
1302	update_object (last, UP_OBJ_REMOVE);	1081	update_object (last, UP_OBJ_REMOVE);
1303		1082
1304	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1083	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1305	update_all_los (op->map, op->x, op->y);	1084	update_all_los (map, x, y);
		1085	}
1306	}	1086	}
1307		1087
1308	/*	1088	/*
1309	* merge_ob(op,top):	1089	* merge_ob(op,top):
1310	*	1090	*
1311	* This function goes through all objects below and including top, and	1091	* This function goes through all objects below and including top, and
1312	* merges op to the first matching object.	1092	* merges op to the first matching object.
1313	* If top is NULL, it is calculated.	1093	* If top is NULL, it is calculated.
1314	* Returns pointer to object if it succeded in the merge, otherwise NULL	1094	* Returns pointer to object if it succeded in the merge, otherwise NULL
1315	*/	1095	*/
1316
1317	object *	1096	object *
1318	merge_ob (object *op, object *top)	1097	merge_ob (object *op, object *top)
1319	{	1098	{
1320	if (!op->nrof)	1099	if (!op->nrof)
1321	return 0;	1100	return 0;
		1101
1322	if (top == NULL)	1102	if (top == NULL)
1323	for (top = op; top != NULL && top->above != NULL; top = top->above);	1103	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1104
1324	for (; top != NULL; top = top->below)	1105	for (; top != NULL; top = top->below)
1325	{	1106	{
1326	if (top == op)	1107	if (top == op)
1327	continue;	1108	continue;
1328	if (CAN_MERGE (op, top))	1109
		1110	if (object::can_merge (op, top))
1329	{	1111	{
1330	top->nrof += op->nrof;	1112	top->nrof += op->nrof;
1331		1113
1332	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1114	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1333	op->weight = 0; /* Don't want any adjustements now */	1115	op->weight = 0; /* Don't want any adjustements now */
1334	remove_ob (op);	1116	op->destroy ();
1335	free_object (op);
1336	return top;	1117	return top;
1337	}	1118	}
1338	}	1119	}
		1120
1339	return NULL;	1121	return 0;
1340	}	1122	}
1341		1123
1342	/*	1124	/*
1343	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1125	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1344	* job preparing multi-part monsters	1126	* job preparing multi-part monsters
1345	*/	1127	*/
1346	object *	1128	object *
1347	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1129	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1348	{	1130	{
1349	object *	1131	object *tmp;
1350	tmp;
1351		1132
1352	if (op->head)	1133	if (op->head)
1353	op = op->head;	1134	op = op->head;
		1135
1354	for (tmp = op; tmp; tmp = tmp->more)	1136	for (tmp = op; tmp; tmp = tmp->more)
1355	{	1137	{
1356	tmp->x = x + tmp->arch->clone.x;	1138	tmp->x = x + tmp->arch->clone.x;
1357	tmp->y = y + tmp->arch->clone.y;	1139	tmp->y = y + tmp->arch->clone.y;
1358	}	1140	}
		1141
1359	return insert_ob_in_map (op, m, originator, flag);	1142	return insert_ob_in_map (op, m, originator, flag);
1360	}	1143	}
1361		1144
1362	/*	1145	/*
1363	* insert_ob_in_map (op, map, originator, flag):	1146	* insert_ob_in_map (op, map, originator, flag):
…		…
1379	* NULL if 'op' was destroyed	1162	* NULL if 'op' was destroyed
1380	* just 'op' otherwise	1163	* just 'op' otherwise
1381	*/	1164	*/
1382		1165
1383	object *	1166	object *
1384	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1167	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1385	{	1168	{
1386	object *tmp, *top, *floor = NULL;	1169	object *tmp, *top, *floor = NULL;
1387	sint16 x, y;	1170	sint16 x, y;
1388		1171
1389	if (QUERY_FLAG (op, FLAG_FREED))	1172	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1392	return NULL;	1175	return NULL;
1393	}	1176	}
1394		1177
1395	if (m == NULL)	1178	if (m == NULL)
1396	{	1179	{
1397	dump_object (op);	1180	char *dump = dump_object (op);
1398	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1181	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1182	free (dump);
1399	return op;	1183	return op;
1400	}	1184	}
1401		1185
1402	if (out_of_map (m, op->x, op->y))	1186	if (out_of_map (m, op->x, op->y))
1403	{	1187	{
1404	dump_object (op);	1188	char *dump = dump_object (op);
1405	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1189	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1406	#ifdef MANY_CORES	1190	#ifdef MANY_CORES
1407	/* Better to catch this here, as otherwise the next use of this object	1191	/* Better to catch this here, as otherwise the next use of this object
1408	* is likely to cause a crash. Better to find out where it is getting	1192	* is likely to cause a crash. Better to find out where it is getting
1409	* improperly inserted.	1193	* improperly inserted.
1410	*/	1194	*/
1411	abort ();	1195	abort ();
1412	#endif	1196	#endif
		1197	free (dump);
1413	return op;	1198	return op;
1414	}	1199	}
1415		1200
1416	if (!QUERY_FLAG (op, FLAG_REMOVED))	1201	if (!QUERY_FLAG (op, FLAG_REMOVED))
1417	{	1202	{
1418	dump_object (op);	1203	char *dump = dump_object (op);
1419	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1204	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1205	free (dump);
1420	return op;	1206	return op;
1421	}	1207	}
1422		1208
1423	if (op->more != NULL)	1209	if (op->more != NULL)
1424	{	1210	{
…		…
1462		1248
1463	/* this has to be done after we translate the coordinates.	1249	/* this has to be done after we translate the coordinates.
1464	*/	1250	*/
1465	if (op->nrof && !(flag & INS_NO_MERGE))	1251	if (op->nrof && !(flag & INS_NO_MERGE))
1466	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1252	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1467	if (CAN_MERGE (op, tmp))	1253	if (object::can_merge (op, tmp))
1468	{	1254	{
1469	op->nrof += tmp->nrof;	1255	op->nrof += tmp->nrof;
1470	remove_ob (tmp);	1256	tmp->destroy ();
1471	free_object (tmp);
1472	}	1257	}
1473		1258
1474	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1259	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1475	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1260	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1476		1261
…		…
1489	op->below = originator->below;	1274	op->below = originator->below;
1490		1275
1491	if (op->below)	1276	if (op->below)
1492	op->below->above = op;	1277	op->below->above = op;
1493	else	1278	else
1494	SET_MAP_OB (op->map, op->x, op->y, op);	1279	op->ms ().bottom = op;
1495		1280
1496	/* since *below* originator, no need to update top */	1281	/* since *below* originator, no need to update top */
1497	originator->below = op;	1282	originator->below = op;
1498	}	1283	}
1499	else	1284	else
…		…
1545	* If INS_ON_TOP is used, don't do this processing	1330	* If INS_ON_TOP is used, don't do this processing
1546	* Need to find the object that in fact blocks view, otherwise	1331	* Need to find the object that in fact blocks view, otherwise
1547	* stacking is a bit odd.	1332	* stacking is a bit odd.
1548	*/	1333	*/
1549	if (!(flag & INS_ON_TOP) &&	1334	if (!(flag & INS_ON_TOP) &&
1550	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1335	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1551	{	1336	{
1552	for (last = top; last != floor; last = last->below)	1337	for (last = top; last != floor; last = last->below)
1553	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1338	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1554	break;	1339	break;
1555	/* Check to see if we found the object that blocks view,	1340	/* Check to see if we found the object that blocks view,
…		…
1578		1363
1579	if (op->above)	1364	if (op->above)
1580	op->above->below = op;	1365	op->above->below = op;
1581		1366
1582	op->below = NULL;	1367	op->below = NULL;
1583	SET_MAP_OB (op->map, op->x, op->y, op);	1368	op->ms ().bottom = op;
1584	}	1369	}
1585	else	1370	else
1586	{ /* get inserted into the stack above top */	1371	{ /* get inserted into the stack above top */
1587	op->above = top->above;	1372	op->above = top->above;
1588		1373
…		…
1592	op->below = top;	1377	op->below = top;
1593	top->above = op;	1378	top->above = op;
1594	}	1379	}
1595		1380
1596	if (op->above == NULL)	1381	if (op->above == NULL)
1597	SET_MAP_TOP (op->map, op->x, op->y, op);	1382	op->ms ().top = op;
1598	} /* else not INS_BELOW_ORIGINATOR */	1383	} /* else not INS_BELOW_ORIGINATOR */
1599		1384
1600	if (op->type == PLAYER)	1385	if (op->type == PLAYER)
1601	op->contr->do_los = 1;	1386	op->contr->do_los = 1;
1602		1387
1603	/* If we have a floor, we know the player, if any, will be above	1388	/* If we have a floor, we know the player, if any, will be above
1604	* it, so save a few ticks and start from there.	1389	* it, so save a few ticks and start from there.
1605	*/	1390	*/
1606	if (!(flag & INS_MAP_LOAD))	1391	if (!(flag & INS_MAP_LOAD))
1607	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1392	if (object *pl = op->ms ().player ())
1608	if (tmp->type == PLAYER)	1393	pl->contr->ns->floorbox_update ();
1609	tmp->contr->socket.update_look = 1;
1610		1394
1611	/* If this object glows, it may affect lighting conditions that are	1395	/* If this object glows, it may affect lighting conditions that are
1612	* visible to others on this map. But update_all_los is really	1396	* visible to others on this map. But update_all_los is really
1613	* an inefficient way to do this, as it means los for all players	1397	* an inefficient way to do this, as it means los for all players
1614	* on the map will get recalculated. The players could very well	1398	* on the map will get recalculated. The players could very well
…		…
1622		1406
1623	/* updates flags (blocked, alive, no magic, etc) for this map space */	1407	/* updates flags (blocked, alive, no magic, etc) for this map space */
1624	update_object (op, UP_OBJ_INSERT);	1408	update_object (op, UP_OBJ_INSERT);
1625		1409
1626	/* Don't know if moving this to the end will break anything. However,	1410	/* Don't know if moving this to the end will break anything. However,
1627	* we want to have update_look set above before calling this.	1411	* we want to have floorbox_update called before calling this.
1628	*	1412	*
1629	* check_move_on() must be after this because code called from	1413	* check_move_on() must be after this because code called from
1630	* check_move_on() depends on correct map flags (so functions like	1414	* check_move_on() depends on correct map flags (so functions like
1631	* blocked() and wall() work properly), and these flags are updated by	1415	* blocked() and wall() work properly), and these flags are updated by
1632	* update_object().	1416	* update_object().
…		…
1648		1432
1649	return op;	1433	return op;
1650	}	1434	}
1651		1435
1652	/* this function inserts an object in the map, but if it	1436	/* this function inserts an object in the map, but if it
1653	* finds an object of its own type, it'll remove that one first.	1437	* finds an object of its own type, it'll remove that one first.
1654	* op is the object to insert it under: supplies x and the map.	1438	* op is the object to insert it under: supplies x and the map.
1655	*/	1439	*/
1656	void	1440	void
1657	replace_insert_ob_in_map (const char *arch_string, object *op)	1441	replace_insert_ob_in_map (const char *arch_string, object *op)
1658	{	1442	{
1659	object *tmp;
1660	object *tmp1;	1443	object *tmp, *tmp1;
1661		1444
1662	/* first search for itself and remove any old instances */	1445	/* first search for itself and remove any old instances */
1663		1446
1664	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1447	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1665	{
1666	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1448	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1667	{	1449	tmp->destroy ();
1668	remove_ob (tmp);
1669	free_object (tmp);
1670	}
1671	}
1672		1450
1673	tmp1 = arch_to_object (find_archetype (arch_string));	1451	tmp1 = arch_to_object (archetype::find (arch_string));
1674		1452
1675	tmp1->x = op->x;	1453	tmp1->x = op->x;
1676	tmp1->y = op->y;	1454	tmp1->y = op->y;
1677	insert_ob_in_map (tmp1, op->map, op, 0);	1455	insert_ob_in_map (tmp1, op->map, op, 0);
1678	}	1456	}
…		…
1686	*/	1464	*/
1687		1465
1688	object *	1466	object *
1689	get_split_ob (object *orig_ob, uint32 nr)	1467	get_split_ob (object *orig_ob, uint32 nr)
1690	{	1468	{
1691	object *	1469	object *newob;
1692	newob;
1693	int
1694	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1470	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1695		1471
1696	if (orig_ob->nrof < nr)	1472	if (orig_ob->nrof < nr)
1697	{	1473	{
1698	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1474	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1699	return NULL;	1475	return NULL;
1700	}	1476	}
		1477
1701	newob = object_create_clone (orig_ob);	1478	newob = object_create_clone (orig_ob);
		1479
1702	if ((orig_ob->nrof -= nr) < 1)	1480	if ((orig_ob->nrof -= nr) < 1)
1703	{	1481	orig_ob->destroy (1);
1704	if (!is_removed)
1705	remove_ob (orig_ob);
1706	free_object2 (orig_ob, 1);
1707	}
1708	else if (!is_removed)	1482	else if (!is_removed)
1709	{	1483	{
1710	if (orig_ob->env != NULL)	1484	if (orig_ob->env != NULL)
1711	sub_weight (orig_ob->env, orig_ob->weight * nr);	1485	sub_weight (orig_ob->env, orig_ob->weight * nr);
1712	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1486	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1714	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1488	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1715	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1489	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1716	return NULL;	1490	return NULL;
1717	}	1491	}
1718	}	1492	}
		1493
1719	newob->nrof = nr;	1494	newob->nrof = nr;
1720		1495
1721	return newob;	1496	return newob;
1722	}	1497	}
1723		1498
…		…
1730	*/	1505	*/
1731		1506
1732	object *	1507	object *
1733	decrease_ob_nr (object *op, uint32 i)	1508	decrease_ob_nr (object *op, uint32 i)
1734	{	1509	{
1735	object *	1510	object *tmp;
1736	tmp;
1737	player *	1511	player *pl;
1738	pl;
1739		1512
1740	if (i == 0) /* objects with op->nrof require this check */	1513	if (i == 0) /* objects with op->nrof require this check */
1741	return op;	1514	return op;
1742		1515
1743	if (i > op->nrof)	1516	if (i > op->nrof)
1744	i = op->nrof;	1517	i = op->nrof;
1745		1518
1746	if (QUERY_FLAG (op, FLAG_REMOVED))	1519	if (QUERY_FLAG (op, FLAG_REMOVED))
1747	{
1748	op->nrof -= i;	1520	op->nrof -= i;
1749	}
1750	else if (op->env != NULL)	1521	else if (op->env)
1751	{	1522	{
1752	/* is this object in the players inventory, or sub container	1523	/* is this object in the players inventory, or sub container
1753	* therein?	1524	* therein?
1754	*/	1525	*/
1755	tmp = is_player_inv (op->env);	1526	tmp = op->in_player ();
1756	/* nope. Is this a container the player has opened?	1527	/* nope. Is this a container the player has opened?
1757	* If so, set tmp to that player.	1528	* If so, set tmp to that player.
1758	* IMO, searching through all the players will mostly	1529	* IMO, searching through all the players will mostly
1759	* likely be quicker than following op->env to the map,	1530	* likely be quicker than following op->env to the map,
1760	* and then searching the map for a player.	1531	* and then searching the map for a player.
1761	*/	1532	*/
1762	if (!tmp)	1533	if (!tmp)
1763	{	1534	{
1764	for (pl = first_player; pl; pl = pl->next)	1535	for (pl = first_player; pl; pl = pl->next)
1765	if (pl->ob->container == op->env)	1536	if (pl->ob->container == op->env)
		1537	{
		1538	tmp = pl->ob;
1766	break;	1539	break;
1767	if (pl)	1540	}
1768	tmp = pl->ob;
1769	else
1770	tmp = NULL;
1771	}	1541	}
1772		1542
1773	if (i < op->nrof)	1543	if (i < op->nrof)
1774	{	1544	{
1775	sub_weight (op->env, op->weight * i);	1545	sub_weight (op->env, op->weight * i);
1776	op->nrof -= i;	1546	op->nrof -= i;
1777	if (tmp)	1547	if (tmp)
1778	{
1779	esrv_send_item (tmp, op);	1548	esrv_send_item (tmp, op);
1780	}
1781	}	1549	}
1782	else	1550	else
1783	{	1551	{
1784	remove_ob (op);	1552	op->remove ();
1785	op->nrof = 0;	1553	op->nrof = 0;
1786	if (tmp)	1554	if (tmp)
1787	{
1788	esrv_del_item (tmp->contr, op->count);	1555	esrv_del_item (tmp->contr, op->count);
1789	}
1790	}	1556	}
1791	}	1557	}
1792	else	1558	else
1793	{	1559	{
1794	object *
1795	above = op->above;	1560	object *above = op->above;
1796		1561
1797	if (i < op->nrof)	1562	if (i < op->nrof)
1798	{
1799	op->nrof -= i;	1563	op->nrof -= i;
1800	}
1801	else	1564	else
1802	{	1565	{
1803	remove_ob (op);	1566	op->remove ();
1804	op->nrof = 0;	1567	op->nrof = 0;
1805	}	1568	}
		1569
1806	/* Since we just removed op, op->above is null */	1570	/* Since we just removed op, op->above is null */
1807	for (tmp = above; tmp != NULL; tmp = tmp->above)	1571	for (tmp = above; tmp; tmp = tmp->above)
1808	if (tmp->type == PLAYER)	1572	if (tmp->type == PLAYER)
1809	{	1573	{
1810	if (op->nrof)	1574	if (op->nrof)
1811	esrv_send_item (tmp, op);	1575	esrv_send_item (tmp, op);
1812	else	1576	else
1813	esrv_del_item (tmp->contr, op->count);	1577	esrv_del_item (tmp->contr, op->count);
1814	}	1578	}
1815	}	1579	}
1816		1580
1817	if (op->nrof)	1581	if (op->nrof)
1818	{
1819	return op;	1582	return op;
1820	}
1821	else	1583	else
1822	{	1584	{
1823	free_object (op);	1585	op->destroy ();
1824	return NULL;	1586	return 0;
1825	}	1587	}
1826	}	1588	}
1827		1589
1828	/*	1590	/*
1829	* add_weight(object, weight) adds the specified weight to an object,	1591	* add_weight(object, weight) adds the specified weight to an object,
…		…
1834	add_weight (object *op, signed long weight)	1596	add_weight (object *op, signed long weight)
1835	{	1597	{
1836	while (op != NULL)	1598	while (op != NULL)
1837	{	1599	{
1838	if (op->type == CONTAINER)	1600	if (op->type == CONTAINER)
1839	{
1840	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1601	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1841	}	1602
1842	op->carrying += weight;	1603	op->carrying += weight;
1843	op = op->env;	1604	op = op->env;
1844	}	1605	}
1845	}	1606	}
1846		1607
		1608	object *
		1609	insert_ob_in_ob (object *op, object *where)
		1610	{
		1611	if (!where)
		1612	{
		1613	char *dump = dump_object (op);
		1614	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1615	free (dump);
		1616	return op;
		1617	}
		1618
		1619	if (where->head)
		1620	{
		1621	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1622	where = where->head;
		1623	}
		1624
		1625	return where->insert (op);
		1626	}
		1627
1847	/*	1628	/*
1848	* insert_ob_in_ob(op,environment):	1629	* env->insert (op)
1849	* This function inserts the object op in the linked list	1630	* This function inserts the object op in the linked list
1850	* inside the object environment.	1631	* inside the object environment.
1851	*	1632	*
1852	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1853	* the inventory at the last position or next to other objects of the same
1854	* type.
1855	* Frank: Now sorted by type, archetype and magic!
1856	*
1857	* The function returns now pointer to inserted item, and return value can	1633	* The function returns now pointer to inserted item, and return value can
1858	* be != op, if items are merged. -Tero	1634	* be != op, if items are merged. -Tero
1859	*/	1635	*/
1860		1636
1861	object *	1637	object *
1862	insert_ob_in_ob (object *op, object *where)	1638	object::insert (object *op)
1863	{	1639	{
1864	object *	1640	object *tmp, *otmp;
1865	tmp, *
1866	otmp;
1867		1641
1868	if (!QUERY_FLAG (op, FLAG_REMOVED))	1642	if (!QUERY_FLAG (op, FLAG_REMOVED))
1869	{	1643	op->remove ();
1870	dump_object (op);	1644
1871	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1872	return op;
1873	}
1874	if (where == NULL)
1875	{
1876	dump_object (op);
1877	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1878	return op;
1879	}
1880	if (where->head)
1881	{
1882	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1883	where = where->head;
1884	}
1885	if (op->more)	1645	if (op->more)
1886	{	1646	{
1887	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1647	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1888	return op;	1648	return op;
1889	}	1649	}
		1650
1890	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1651	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1891	CLEAR_FLAG (op, FLAG_REMOVED);	1652	CLEAR_FLAG (op, FLAG_REMOVED);
1892	if (op->nrof)	1653	if (op->nrof)
1893	{	1654	{
1894	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1655	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1895	if (CAN_MERGE (tmp, op))	1656	if (object::can_merge (tmp, op))
1896	{	1657	{
1897	/* return the original object and remove inserted object	1658	/* return the original object and remove inserted object
1898	(client needs the original object) */	1659	(client needs the original object) */
1899	tmp->nrof += op->nrof;	1660	tmp->nrof += op->nrof;
1900	/* Weight handling gets pretty funky. Since we are adding to	1661	/* Weight handling gets pretty funky. Since we are adding to
1901	* tmp->nrof, we need to increase the weight.	1662	* tmp->nrof, we need to increase the weight.
1902	*/	1663	*/
1903	add_weight (where, op->weight * op->nrof);	1664	add_weight (this, op->weight * op->nrof);
1904	SET_FLAG (op, FLAG_REMOVED);	1665	SET_FLAG (op, FLAG_REMOVED);
1905	free_object (op); /* free the inserted object */	1666	op->destroy (); /* free the inserted object */
1906	op = tmp;	1667	op = tmp;
1907	remove_ob (op); /* and fix old object's links */	1668	op->remove (); /* and fix old object's links */
1908	CLEAR_FLAG (op, FLAG_REMOVED);	1669	CLEAR_FLAG (op, FLAG_REMOVED);
1909	break;	1670	break;
1910	}	1671	}
1911		1672
1912	/* I assume combined objects have no inventory	1673	/* I assume combined objects have no inventory
1913	* We add the weight - this object could have just been removed	1674	* We add the weight - this object could have just been removed
1914	* (if it was possible to merge). calling remove_ob will subtract	1675	* (if it was possible to merge). calling remove_ob will subtract
1915	* the weight, so we need to add it in again, since we actually do	1676	* the weight, so we need to add it in again, since we actually do
1916	* the linking below	1677	* the linking below
1917	*/	1678	*/
1918	add_weight (where, op->weight * op->nrof);	1679	add_weight (this, op->weight * op->nrof);
1919	}	1680	}
1920	else	1681	else
1921	add_weight (where, (op->weight + op->carrying));	1682	add_weight (this, (op->weight + op->carrying));
1922		1683
1923	otmp = is_player_inv (where);	1684	otmp = this->in_player ();
1924	if (otmp && otmp->contr != NULL)	1685	if (otmp && otmp->contr)
1925	{
1926	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1686	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1927	fix_player (otmp);	1687	otmp->update_stats ();
1928	}
1929		1688
1930	op->map = NULL;	1689	op->map = 0;
1931	op->env = where;	1690	op->env = this;
1932	op->above = NULL;	1691	op->above = 0;
1933	op->below = NULL;	1692	op->below = 0;
1934	op->x = 0, op->y = 0;	1693	op->x = 0, op->y = 0;
1935		1694
1936	/* reset the light list and los of the players on the map */	1695	/* reset the light list and los of the players on the map */
1937	if ((op->glow_radius != 0) && where->map)	1696	if ((op->glow_radius != 0) && map)
1938	{	1697	{
1939	#ifdef DEBUG_LIGHTS	1698	#ifdef DEBUG_LIGHTS
1940	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1699	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1941	#endif /* DEBUG_LIGHTS */	1700	#endif /* DEBUG_LIGHTS */
1942	if (MAP_DARKNESS (where->map))	1701	if (MAP_DARKNESS (map))
1943	update_all_los (where->map, where->x, where->y);	1702	update_all_los (map, x, y);
1944	}	1703	}
1945		1704
1946	/* Client has no idea of ordering so lets not bother ordering it here.	1705	/* Client has no idea of ordering so lets not bother ordering it here.
1947	* It sure simplifies this function...	1706	* It sure simplifies this function...
1948	*/	1707	*/
1949	if (where->inv == NULL)	1708	if (!inv)
1950	where->inv = op;	1709	inv = op;
1951	else	1710	else
1952	{	1711	{
1953	op->below = where->inv;	1712	op->below = inv;
1954	op->below->above = op;	1713	op->below->above = op;
1955	where->inv = op;	1714	inv = op;
1956	}	1715	}
		1716
1957	return op;	1717	return op;
1958	}	1718	}
1959		1719
1960	/*	1720	/*
1961	* Checks if any objects has a move_type that matches objects	1721	* Checks if any objects has a move_type that matches objects
…		…
1980		1740
1981	int	1741	int
1982	check_move_on (object *op, object *originator)	1742	check_move_on (object *op, object *originator)
1983	{	1743	{
1984	object *tmp;	1744	object *tmp;
1985	tag_t tag;
1986	mapstruct *m = op->map;	1745	maptile *m = op->map;
1987	int x = op->x, y = op->y;	1746	int x = op->x, y = op->y;
1988		1747
1989	MoveType move_on, move_slow, move_block;	1748	MoveType move_on, move_slow, move_block;
1990		1749
1991	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1750	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1992	return 0;	1751	return 0;
1993
1994	tag = op->count;
1995		1752
1996	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1753	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1997	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1754	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1998	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1755	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1999		1756
…		…
2042	{	1799	{
2043	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1800	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2044	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1801	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2045	{	1802	{
2046		1803
		1804	float
2047	float diff = tmp->move_slow_penalty * FABS (op->speed);	1805	diff = tmp->move_slow_penalty * FABS (op->speed);
2048		1806
2049	if (op->type == PLAYER)	1807	if (op->type == PLAYER)
2050	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1808	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2051	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1809	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2052	diff /= 4.0;	1810	diff /= 4.0;
…		…
2059	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1817	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2060	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1818	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2061	{	1819	{
2062	move_apply (tmp, op, originator);	1820	move_apply (tmp, op, originator);
2063		1821
2064	if (was_destroyed (op, tag))	1822	if (op->destroyed ())
2065	return 1;	1823	return 1;
2066		1824
2067	/* what the person/creature stepped onto has moved the object	1825	/* what the person/creature stepped onto has moved the object
2068	* someplace new. Don't process any further - if we did,	1826	* someplace new. Don't process any further - if we did,
2069	* have a feeling strange problems would result.	1827	* have a feeling strange problems would result.
…		…
2081	* a matching archetype at the given map and coordinates.	1839	* a matching archetype at the given map and coordinates.
2082	* The first matching object is returned, or NULL if none.	1840	* The first matching object is returned, or NULL if none.
2083	*/	1841	*/
2084		1842
2085	object *	1843	object *
2086	present_arch (const archetype *at, mapstruct *m, int x, int y)	1844	present_arch (const archetype *at, maptile *m, int x, int y)
2087	{	1845	{
2088	object *	1846	object *
2089	tmp;	1847	tmp;
2090		1848
2091	if (m == NULL || out_of_map (m, x, y))	1849	if (m == NULL || out_of_map (m, x, y))
…		…
2104	* a matching type variable at the given map and coordinates.	1862	* a matching type variable at the given map and coordinates.
2105	* The first matching object is returned, or NULL if none.	1863	* The first matching object is returned, or NULL if none.
2106	*/	1864	*/
2107		1865
2108	object *	1866	object *
2109	present (unsigned char type, mapstruct *m, int x, int y)	1867	present (unsigned char type, maptile *m, int x, int y)
2110	{	1868	{
2111	object *	1869	object *
2112	tmp;	1870	tmp;
2113		1871
2114	if (out_of_map (m, x, y))	1872	if (out_of_map (m, x, y))
…		…
2254	* the archetype because that isn't correct if the monster has been	2012	* the archetype because that isn't correct if the monster has been
2255	* customized, changed states, etc.	2013	* customized, changed states, etc.
2256	*/	2014	*/
2257		2015
2258	int	2016	int
2259	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2017	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2260	{	2018	{
2261	int	2019	int
2262	i,	2020	i,
2263	index = 0, flag;	2021	index = 0, flag;
2264	static int	2022	static int
…		…
2276	* if the space being examined only has a wall to the north and empty	2034	* if the space being examined only has a wall to the north and empty
2277	* spaces in all the other directions, this will reduce the search space	2035	* spaces in all the other directions, this will reduce the search space
2278	* to only the spaces immediately surrounding the target area, and	2036	* to only the spaces immediately surrounding the target area, and
2279	* won't look 2 spaces south of the target space.	2037	* won't look 2 spaces south of the target space.
2280	*/	2038	*/
2281	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2039	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2282	stop = maxfree[i];	2040	stop = maxfree[i];
2283	}	2041	}
		2042
2284	if (!index)	2043	if (!index)
2285	return -1;	2044	return -1;
		2045
2286	return altern[RANDOM () % index];	2046	return altern[RANDOM () % index];
2287	}	2047	}
2288		2048
2289	/*	2049	/*
2290	* find_first_free_spot(archetype, mapstruct, x, y) works like	2050	* find_first_free_spot(archetype, maptile, x, y) works like
2291	* find_free_spot(), but it will search max number of squares.	2051	* find_free_spot(), but it will search max number of squares.
2292	* But it will return the first available spot, not a random choice.	2052	* But it will return the first available spot, not a random choice.
2293	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2053	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2294	*/	2054	*/
2295		2055
2296	int	2056	int
2297	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2057	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2298	{	2058	{
2299	int	2059	int
2300	i;	2060	i;
2301		2061
2302	for (i = 0; i < SIZEOFFREE; i++)	2062	for (i = 0; i < SIZEOFFREE; i++)
…		…
2366	* because we have to know what movement the thing looking to move	2126	* because we have to know what movement the thing looking to move
2367	* there is capable of.	2127	* there is capable of.
2368	*/	2128	*/
2369		2129
2370	int	2130	int
2371	find_dir (mapstruct *m, int x, int y, object *exclude)	2131	find_dir (maptile *m, int x, int y, object *exclude)
2372	{	2132	{
2373	int	2133	int
2374	i,	2134	i,
2375	max = SIZEOFFREE, mflags;	2135	max = SIZEOFFREE, mflags;
2376	sint16	2136
2377	nx,	2137	sint16 nx, ny;
2378	ny;
2379	object *	2138	object *
2380	tmp;	2139	tmp;
2381	mapstruct *	2140	maptile *
2382	mp;	2141	mp;
2383	MoveType	2142
2384	blocked,	2143	MoveType blocked, move_type;
2385	move_type;
2386		2144
2387	if (exclude && exclude->head)	2145	if (exclude && exclude->head)
2388	{	2146	{
2389	exclude = exclude->head;	2147	exclude = exclude->head;
2390	move_type = exclude->move_type;	2148	move_type = exclude->move_type;
…		…
2400	mp = m;	2158	mp = m;
2401	nx = x + freearr_x[i];	2159	nx = x + freearr_x[i];
2402	ny = y + freearr_y[i];	2160	ny = y + freearr_y[i];
2403		2161
2404	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2162	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2163
2405	if (mflags & P_OUT_OF_MAP)	2164	if (mflags & P_OUT_OF_MAP)
2406	{
2407	max = maxfree[i];	2165	max = maxfree[i];
2408	}
2409	else	2166	else
2410	{	2167	{
2411	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2168	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);
2412		2169
2413	if ((move_type & blocked) == move_type)	2170	if ((move_type & blocked) == move_type)
2414	{
2415	max = maxfree[i];	2171	max = maxfree[i];
2416	}
2417	else if (mflags & P_IS_ALIVE)	2172	else if (mflags & P_IS_ALIVE)
2418	{	2173	{
2419	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2174	for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)
2420	{
2421	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2175	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2422	{
2423	break;	2176	break;
2424	}	2177
2425	}
2426	if (tmp)	2178	if (tmp)
2427	{
2428	return freedir[i];	2179	return freedir[i];
2429	}
2430	}	2180	}
2431	}	2181	}
2432	}	2182	}
		2183
2433	return 0;	2184	return 0;
2434	}	2185	}
2435		2186
2436	/*	2187	/*
2437	* distance(object 1, object 2) will return the square of the	2188	* distance(object 1, object 2) will return the square of the
…		…
2439	*/	2190	*/
2440		2191
2441	int	2192	int
2442	distance (const object *ob1, const object *ob2)	2193	distance (const object *ob1, const object *ob2)
2443	{	2194	{
2444	int	2195	int i;
2445	i;
2446		2196
2447	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2197	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2448	return i;	2198	return i;
2449	}	2199	}
2450		2200
…		…
2455	*/	2205	*/
2456		2206
2457	int	2207	int
2458	find_dir_2 (int x, int y)	2208	find_dir_2 (int x, int y)
2459	{	2209	{
2460	int	2210	int q;
2461	q;
2462		2211
2463	if (y)	2212	if (y)
2464	q = x * 100 / y;	2213	q = x * 100 / y;
2465	else if (x)	2214	else if (x)
2466	q = -300 * x;	2215	q = -300 * x;
…		…
2592	* find a path to that monster that we found. If not,	2341	* find a path to that monster that we found. If not,
2593	* we don't bother going toward it. Returns 1 if we	2342	* we don't bother going toward it. Returns 1 if we
2594	* can see a direct way to get it	2343	* can see a direct way to get it
2595	* Modified to be map tile aware -.MSW	2344	* Modified to be map tile aware -.MSW
2596	*/	2345	*/
2597
2598
2599	int	2346	int
2600	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2347	can_see_monsterP (maptile *m, int x, int y, int dir)
2601	{	2348	{
2602	sint16	2349	sint16 dx, dy;
2603	dx,
2604	dy;
2605	int
2606	mflags;	2350	int mflags;
2607		2351
2608	if (dir < 0)	2352	if (dir < 0)
2609	return 0; /* exit condition: invalid direction */	2353	return 0; /* exit condition: invalid direction */
2610		2354
2611	dx = x + freearr_x[dir];	2355	dx = x + freearr_x[dir];
…		…
2624	return 0;	2368	return 0;
2625		2369
2626	/* yes, can see. */	2370	/* yes, can see. */
2627	if (dir < 9)	2371	if (dir < 9)
2628	return 1;	2372	return 1;
		2373
2629	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2374	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2630	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2375	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2376	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2631	}	2377	}
2632
2633
2634		2378
2635	/*	2379	/*
2636	* can_pick(picker, item): finds out if an object is possible to be	2380	* can_pick(picker, item): finds out if an object is possible to be
2637	* picked up by the picker. Returnes 1 if it can be	2381	* picked up by the picker. Returnes 1 if it can be
2638	* picked up, otherwise 0.	2382	* picked up, otherwise 0.
…		…
2649	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2393	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2650	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2394	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2651	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2395	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2652	}	2396	}
2653		2397
2654
2655	/*	2398	/*
2656	* create clone from object to another	2399	* create clone from object to another
2657	*/	2400	*/
2658	object *	2401	object *
2659	object_create_clone (object *asrc)	2402	object_create_clone (object *asrc)
2660	{	2403	{
2661	object *
2662	dst = NULL, *tmp, *src, *part, *prev, *item;	2404	object *dst = 0, *tmp, *src, *part, *prev, *item;
2663		2405
2664	if (!asrc)	2406	if (!asrc)
2665	return NULL;	2407	return 0;
		2408
2666	src = asrc;	2409	src = asrc;
2667	if (src->head)	2410	if (src->head)
2668	src = src->head;	2411	src = src->head;
2669		2412
2670	prev = NULL;	2413	prev = 0;
2671	for (part = src; part; part = part->more)	2414	for (part = src; part; part = part->more)
2672	{	2415	{
2673	tmp = get_object ();	2416	tmp = part->clone ();
2674	copy_object (part, tmp);
2675	tmp->x -= src->x;	2417	tmp->x -= src->x;
2676	tmp->y -= src->y;	2418	tmp->y -= src->y;
		2419
2677	if (!part->head)	2420	if (!part->head)
2678	{	2421	{
2679	dst = tmp;	2422	dst = tmp;
2680	tmp->head = NULL;	2423	tmp->head = 0;
2681	}	2424	}
2682	else	2425	else
2683	{
2684	tmp->head = dst;	2426	tmp->head = dst;
2685	}	2427
2686	tmp->more = NULL;	2428	tmp->more = 0;
		2429
2687	if (prev)	2430	if (prev)
2688	prev->more = tmp;	2431	prev->more = tmp;
		2432
2689	prev = tmp;	2433	prev = tmp;
2690	}	2434	}
2691		2435
2692	/*** copy inventory ***/
2693	for (item = src->inv; item; item = item->below)	2436	for (item = src->inv; item; item = item->below)
2694	{
2695	(void) insert_ob_in_ob (object_create_clone (item), dst);	2437	insert_ob_in_ob (object_create_clone (item), dst);
2696	}
2697		2438
2698	return dst;	2439	return dst;
2699	}	2440	}
2700		2441
2701	/* return true if the object was destroyed, 0 otherwise */
2702	int
2703	was_destroyed (const object *op, tag_t old_tag)
2704	{
2705	/* checking for FLAG_FREED isn't necessary, but makes this function more
2706	* robust */
2707	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2708	}
2709
2710	/* GROS - Creates an object using a string representing its content. */	2442	/* GROS - Creates an object using a string representing its content. */
2711
2712	/* Basically, we save the content of the string to a temp file, then call */	2443	/* Basically, we save the content of the string to a temp file, then call */
2713
2714	/* load_object on it. I admit it is a highly inefficient way to make things, */	2444	/* load_object on it. I admit it is a highly inefficient way to make things, */
2715
2716	/* but it was simple to make and allows reusing the load_object function. */	2445	/* but it was simple to make and allows reusing the load_object function. */
2717
2718	/* Remember not to use load_object_str in a time-critical situation. */	2446	/* Remember not to use load_object_str in a time-critical situation. */
2719
2720	/* Also remember that multiparts objects are not supported for now. */	2447	/* Also remember that multiparts objects are not supported for now. */
2721		2448
2722	object *	2449	object *
2723	load_object_str (const char *obstr)	2450	load_object_str (const char *obstr)
2724	{	2451	{
2725	object *	2452	object *op;
2726	op;
2727	char
2728	filename[MAX_BUF];	2453	char filename[MAX_BUF];
2729		2454
2730	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2455	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2731		2456
2732	FILE *
2733	tempfile = fopen (filename, "w");	2457	FILE *tempfile = fopen (filename, "w");
2734		2458
2735	if (tempfile == NULL)	2459	if (tempfile == NULL)
2736	{	2460	{
2737	LOG (llevError, "Error - Unable to access load object temp file\n");	2461	LOG (llevError, "Error - Unable to access load object temp file\n");
2738	return NULL;	2462	return NULL;
2739	};	2463	}
		2464
2740	fprintf (tempfile, obstr);	2465	fprintf (tempfile, obstr);
2741	fclose (tempfile);	2466	fclose (tempfile);
2742		2467
2743	op = get_object ();	2468	op = object::create ();
2744		2469
2745	object_thawer	2470	object_thawer thawer (filename);
2746	thawer (filename);
2747		2471
2748	if (thawer)	2472	if (thawer)
2749	load_object (thawer, op, 0);	2473	load_object (thawer, op, 0);
2750		2474
2751	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2475	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2759	* returns NULL if no match.	2483	* returns NULL if no match.
2760	*/	2484	*/
2761	object *	2485	object *
2762	find_obj_by_type_subtype (const object *who, int type, int subtype)	2486	find_obj_by_type_subtype (const object *who, int type, int subtype)
2763	{	2487	{
2764	object *	2488	object *tmp;
2765	tmp;
2766		2489
2767	for (tmp = who->inv; tmp; tmp = tmp->below)	2490	for (tmp = who->inv; tmp; tmp = tmp->below)
2768	if (tmp->type == type && tmp->subtype == subtype)	2491	if (tmp->type == type && tmp->subtype == subtype)
2769	return tmp;	2492	return tmp;
2770		2493
…		…
2778	* do the desired thing.	2501	* do the desired thing.
2779	*/	2502	*/
2780	key_value *	2503	key_value *
2781	get_ob_key_link (const object *ob, const char *key)	2504	get_ob_key_link (const object *ob, const char *key)
2782	{	2505	{
2783	key_value *	2506	key_value *link;
2784	link;
2785		2507
2786	for (link = ob->key_values; link != NULL; link = link->next)	2508	for (link = ob->key_values; link != NULL; link = link->next)
2787	{
2788	if (link->key == key)	2509	if (link->key == key)
2789	{
2790	return link;	2510	return link;
2791	}
2792	}
2793		2511
2794	return NULL;	2512	return NULL;
2795	}	2513	}
2796		2514
2797	/*	2515	/*
…		…
2802	* The returned string is shared.	2520	* The returned string is shared.
2803	*/	2521	*/
2804	const char *	2522	const char *
2805	get_ob_key_value (const object *op, const char *const key)	2523	get_ob_key_value (const object *op, const char *const key)
2806	{	2524	{
2807	key_value *	2525	key_value *link;
2808	link;	2526	shstr_cmp canonical_key (key);
2809	const char *
2810	canonical_key;
2811		2527
2812	canonical_key = shstr::find (key);
2813
2814	if (canonical_key == NULL)	2528	if (!canonical_key)
2815	{	2529	{
2816	/* 1. There being a field named key on any object	2530	/* 1. There being a field named key on any object
2817	* implies there'd be a shared string to find.	2531	* implies there'd be a shared string to find.
2818	* 2. Since there isn't, no object has this field.	2532	* 2. Since there isn't, no object has this field.
2819	* 3. Therefore, *this* object doesn't have this field.	2533	* 3. Therefore, *this* object doesn't have this field.
2820	*/	2534	*/
2821	return NULL;	2535	return 0;
2822	}	2536	}
2823		2537
2824	/* This is copied from get_ob_key_link() above -	2538	/* This is copied from get_ob_key_link() above -
2825	* only 4 lines, and saves the function call overhead.	2539	* only 4 lines, and saves the function call overhead.
2826	*/	2540	*/
2827	for (link = op->key_values; link != NULL; link = link->next)	2541	for (link = op->key_values; link; link = link->next)
2828	{
2829	if (link->key == canonical_key)	2542	if (link->key == canonical_key)
2830	{
2831	return link->value;	2543	return link->value;
2832	}	2544
2833	}
2834	return NULL;	2545	return 0;
2835	}	2546	}
2836		2547
2837		2548
2838	/*	2549	/*
2839	* Updates the canonical_key in op to value.	2550	* Updates the canonical_key in op to value.
…		…
2875	if (last)	2586	if (last)
2876	last->next = field->next;	2587	last->next = field->next;
2877	else	2588	else
2878	op->key_values = field->next;	2589	op->key_values = field->next;
2879		2590
2880	delete
2881	field;	2591	delete field;
2882	}	2592	}
2883	}	2593	}
2884	return TRUE;	2594	return TRUE;
2885	}	2595	}
2886	/* IF we get here, key doesn't exist */	2596	/* IF we get here, key doesn't exist */
…		…
2921	* Returns TRUE on success.	2631	* Returns TRUE on success.
2922	*/	2632	*/
2923	int	2633	int
2924	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2634	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2925	{	2635	{
2926	shstr
2927	key_ (key);	2636	shstr key_ (key);
2928		2637
2929	return set_ob_key_value_s (op, key_, value, add_key);	2638	return set_ob_key_value_s (op, key_, value, add_key);
2930	}	2639	}
		2640
		2641	object::depth_iterator::depth_iterator (object *container)
		2642	: iterator_base (container)
		2643	{
		2644	while (item->inv)
		2645	item = item->inv;
		2646	}
		2647
		2648	void
		2649	object::depth_iterator::next ()
		2650	{
		2651	if (item->below)
		2652	{
		2653	item = item->below;
		2654
		2655	while (item->inv)
		2656	item = item->inv;
		2657	}
		2658	else
		2659	item = item->env;
		2660	}
		2661
		2662	// return a suitable string describing an objetc in enough detail to find it
		2663	const char *
		2664	object::debug_desc (char *info) const
		2665	{
		2666	char info2[256 * 3];
		2667	char *p = info;
		2668
		2669	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2670	count,
		2671	&name,
		2672	title ? " " : "",
		2673	title ? (const char *)title : "");
		2674
		2675	if (env)
		2676	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2677
		2678	if (map)
		2679	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2680
		2681	return info;
		2682	}
		2683
		2684	const char *
		2685	object::debug_desc () const
		2686	{
		2687	static char info[256 * 3];
		2688	return debug_desc (info);
		2689	}
		2690

Diff Legend

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