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.25 by root, Mon Sep 11 01:16:20 2006 UTC vs.
Revision 1.76 by root, Thu Dec 21 01:33:49 2006 UTC

1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.25 2006/09/11 01:16:20 root Exp $";
5	*/
6
7	/*	1	/*
8	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
9		3
10	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
11	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
…		…
22		16
23	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
24	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
25	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26		20
27	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>
28	*/	22	*/
29		23
30	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
31	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
32	variable. */	26	variable. */
33	#include <global.h>	27	#include <global.h>
34	#ifndef WIN32 /* ---win32 exclude headers */
35	# include <stdio.h>	28	#include <stdio.h>
36	# include <sys/types.h>	29	#include <sys/types.h>
37	# include <sys/uio.h>	30	#include <sys/uio.h>
38	#endif /* win32 */
39	#include <object.h>	31	#include <object.h>
40	#include <funcpoint.h>	32	#include <funcpoint.h>
41	#include <skills.h>
42	#include <loader.h>	33	#include <loader.h>
		34
		35	#include <bitset>
		36
43	int nrofallocobjects = 0;	37	int nrofallocobjects = 0;
		38	static UUID uuid;
		39	const uint64 UUID_SKIP = 1<<19;
44		40
45	object *objects; /* Pointer to the list of used objects */
46	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 */
47		42
48	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,
49	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
50	};	45	};
…		…
57	int freedir[SIZEOFFREE] = {	52	int freedir[SIZEOFFREE] = {
58	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,
59	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
60	};	55	};
61		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
62	/* 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. */
63	static int	135	static int
64	compare_ob_value_lists_one (const object *wants, const object *has)	136	compare_ob_value_lists_one (const object *wants, const object *has)
65	{	137	{
66	key_value *wants_field;	138	key_value *wants_field;
…		…
113	*	185	*
114	* 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
115	* replaces - this is mostly for clarity - a decent compiler should hopefully	187	* replaces - this is mostly for clarity - a decent compiler should hopefully
116	* reduce this to the same efficiency.	188	* reduce this to the same efficiency.
117	*	189	*
118	* Check nrof variable *before* calling CAN_MERGE()	190	* Check nrof variable *before* calling can_merge()
119	*	191	*
120	* Improvements made with merge: Better checking on potion, and also	192	* Improvements made with merge: Better checking on potion, and also
121	* check weight	193	* check weight
122	*/	194	*/
123		195
124	bool object::can_merge (object *ob1, object *ob2)	196	bool object::can_merge_slow (object *ob1, object *ob2)
125	{	197	{
126	/* A couple quicksanity checks */	198	/* A couple quicksanity checks */
127	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)
128	return 0;	204	return 0;
129		205
130	if (ob1->speed != ob2->speed)	206	//TODO: this ain't working well, use nicer and correct overflow check
131	return 0;
132
133	/* 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
134	* 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
135	* used to store nrof).	209	* used to store nrof).
136	*/	210	*/
137	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
147	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
148		222
149	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
150	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
151		225
152		226	if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
153	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	227	|| ob1->arch != ob2->arch
154	* being locked in inventory should prevent merging.
155	* 0x4 in flags3 is CLIENT_SENT
156	*/
157	if ((ob1->arch != ob2->arch) ||
158	(ob1->flags[0] != ob2->flags[0]) ||
159	(ob1->flags[1] != ob2->flags[1]) ||
160	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
161	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
162	(ob1->name != ob2->name) ||	228	|| ob1->name != ob2->name
163	(ob1->title != ob2->title) ||	229	|| ob1->title != ob2->title
164	(ob1->msg != ob2->msg) ||	230	|| ob1->msg != ob2->msg
165	(ob1->weight != ob2->weight) ||	231	|| ob1->weight != ob2->weight
166	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	232	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
167	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	233	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
168	(ob1->attacktype != ob2->attacktype) ||	234	|| ob1->attacktype != ob2->attacktype
169	(ob1->magic != ob2->magic) ||	235	|| ob1->magic != ob2->magic
170	(ob1->slaying != ob2->slaying) ||	236	|| ob1->slaying != ob2->slaying
171	(ob1->skill != ob2->skill) ||	237	|| ob1->skill != ob2->skill
172	(ob1->value != ob2->value) ||	238	|| ob1->value != ob2->value
173	(ob1->animation_id != ob2->animation_id) ||	239	|| ob1->animation_id != ob2->animation_id
174	(ob1->client_type != ob2->client_type) ||	240	|| ob1->client_type != ob2->client_type
175	(ob1->materialname != ob2->materialname) ||	241	|| ob1->materialname != ob2->materialname
176	(ob1->lore != ob2->lore) ||	242	|| ob1->lore != ob2->lore
177	(ob1->subtype != ob2->subtype) ||	243	|| ob1->subtype != ob2->subtype
178	(ob1->move_type != ob2->move_type) ||	244	|| ob1->move_type != ob2->move_type
179	(ob1->move_block != ob2->move_block) ||	245	|| ob1->move_block != ob2->move_block
180	(ob1->move_allow != ob2->move_allow) ||	246	|| ob1->move_allow != ob2->move_allow
181	(ob1->move_on != ob2->move_on) ||	247	|| ob1->move_on != ob2->move_on
182	(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)
183	return 0;	251	return 0;
184		252
185	/* This is really a spellbook check - really, we should	253	/* This is really a spellbook check - really, we should
186	* check all objects in the inventory.	254	* check all objects in the inventory.
187	*/	255	*/
…		…
190	/* 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 */
191	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	259	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
192	return 0;	260	return 0;
193		261
194	/* Now check to see if the two inventory objects could merge */	262	/* Now check to see if the two inventory objects could merge */
195	if (!CAN_MERGE (ob1->inv, ob2->inv))	263	if (!object::can_merge (ob1->inv, ob2->inv))
196	return 0;	264	return 0;
197		265
198	/* 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
199	* if it is valid.	267	* if it is valid.
200	*/	268	*/
…		…
214	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)
215	return 0;	283	return 0;
216		284
217	switch (ob1->type)	285	switch (ob1->type)
218	{	286	{
219	case SCROLL:	287	case SCROLL:
220	if (ob1->level != ob2->level)	288	if (ob1->level != ob2->level)
221	return 0;	289	return 0;
222	break;	290	break;
223	}	291	}
224		292
225	if (ob1->key_values != NULL || ob2->key_values != NULL)	293	if (ob1->key_values != NULL || ob2->key_values != NULL)
226	{	294	{
227	/* At least one of these has key_values. */	295	/* At least one of these has key_values. */
…		…
249	/*	317	/*
250	* sum_weight() is a recursive function which calculates the weight	318	* sum_weight() is a recursive function which calculates the weight
251	* an object is carrying. It goes through in figures out how much	319	* an object is carrying. It goes through in figures out how much
252	* containers are carrying, and sums it up.	320	* containers are carrying, and sums it up.
253	*/	321	*/
254	signed long	322	long
255	sum_weight (object *op)	323	sum_weight (object *op)
256	{	324	{
257	signed long sum;	325	long sum;
258	object *inv;	326	object *inv;
259		327
260	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	328	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)
261	{	329	{
262	if (inv->inv)	330	if (inv->inv)
263	sum_weight (inv);	331	sum_weight (inv);
264	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	332	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
265	}	333	}
		334
266	if (op->type == CONTAINER && op->stats.Str)	335	if (op->type == CONTAINER && op->stats.Str)
267	sum = (sum * (100 - op->stats.Str)) / 100;	336	sum = (sum * (100 - op->stats.Str)) / 100;
		337
268	if (op->carrying != sum)	338	if (op->carrying != sum)
269	op->carrying = sum;	339	op->carrying = sum;
		340
270	return sum;	341	return sum;
271	}	342	}
272		343
273	/**	344	/**
274	* Return the outermost environment object for a given object.	345	* Return the outermost environment object for a given object.
…		…
281	op = op->env;	352	op = op->env;
282	return op;	353	return op;
283	}	354	}
284		355
285	/*	356	/*
286	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
287	* a better check. We basically keeping traversing up until we can't
288	* or find a player.
289	*/
290
291	object *
292	is_player_inv (object *op)
293	{
294	for (; op != NULL && op->type != PLAYER; op = op->env)
295	if (op->env == op)
296	op->env = NULL;
297	return op;
298	}
299
300	/*
301	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
302	* Some error messages.	358	* Some error messages.
303	* 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.
304	*/	360	*/
305		361
306	void	362	char *
307	dump_object2 (object *op)
308	{
309	errmsg[0] = 0;
310	return;
311	//TODO//D#d#
312	#if 0
313	char *cp;
314
315	/* object *tmp;*/
316
317	if (op->arch != NULL)
318	{
319	strcat (errmsg, "arch ");
320	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
321	strcat (errmsg, "\n");
322	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
323	strcat (errmsg, cp);
324	# if 0
325	/* Don't dump player diffs - they are too long, mostly meaningless, and
326	* will overflow the buffer.
327	* Changed so that we don't dump inventory either. This may
328	* also overflow the buffer.
329	*/
330	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
331	strcat (errmsg, cp);
332	for (tmp = op->inv; tmp; tmp = tmp->below)
333	dump_object2 (tmp);
334	# endif
335	strcat (errmsg, "end\n");
336	}
337	else
338	{
339	strcat (errmsg, "Object ");
340	if (op->name == NULL)
341	strcat (errmsg, "(null)");
342	else
343	strcat (errmsg, op->name);
344	strcat (errmsg, "\n");
345	# if 0
346	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
347	strcat (errmsg, cp);
348	for (tmp = op->inv; tmp; tmp = tmp->below)
349	dump_object2 (tmp);
350	# endif
351	strcat (errmsg, "end\n");
352	}
353	#endif
354	}
355
356	/*
357	* Dumps an object. Returns output in the static global errmsg array.
358	*/
359
360	void
361	dump_object (object *op)	363	dump_object (object *op)
362	{	364	{
363	if (op == NULL)	365	if (!op)
364	{	366	return strdup ("[NULLOBJ]");
365	strcpy (errmsg, "[NULL pointer]");
366	return;
367	}
368	errmsg[0] = '\0';
369	dump_object2 (op);
370	}
371		367
372	void	368	object_freezer freezer;
373	dump_all_objects (void)	369	save_object (freezer, op, 3);
374	{	370	return freezer.as_string ();
375	object *op;
376
377	for (op = objects; op != NULL; op = op->next)
378	{
379	dump_object (op);
380	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
381	}
382	}	371	}
383		372
384	/*	373	/*
385	* 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
386	* multi-object 1 which is closest to the second object.	375	* multi-object 1 which is closest to the second object.
…		…
406	*/	395	*/
407		396
408	object *	397	object *
409	find_object (tag_t i)	398	find_object (tag_t i)
410	{	399	{
411	object *op;	400	for (object *op = object::first; op; op = op->next)
412
413	for (op = objects; op != NULL; op = op->next)
414	if (op->count == i)	401	if (op->count == i)
415	break;	402	return op;
		403
416	return op;	404	return 0;
417	}	405	}
418		406
419	/*	407	/*
420	* 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.
421	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
…		…
423	*/	411	*/
424		412
425	object *	413	object *
426	find_object_name (const char *str)	414	find_object_name (const char *str)
427	{	415	{
428	const char *name = shstr::find (str);	416	shstr_cmp str_ (str);
429	object *op;	417	object *op;
430		418
431	for (op = objects; op != NULL; op = op->next)	419	for (op = object::first; op != NULL; op = op->next)
432	if (&op->name == name)	420	if (op->name == str_)
433	break;	421	break;
434		422
435	return op;	423	return op;
436	}	424	}
437		425
…		…
440	{	428	{
441	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	429	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
442	}	430	}
443		431
444	/*	432	/*
445	* Returns the object which this object marks as being the owner.
446	* A id-scheme is used to avoid pointing to objects which have been
447	* freed and are now reused. If this is detected, the owner is
448	* set to NULL, and NULL is returned.
449	* Changed 2004-02-12 - if the player is setting at the play again
450	* prompt, he is removed, and we don't want to treat him as an owner of
451	* anything, so check removed flag. I don't expect that this should break
452	* anything - once an object is removed, it is basically dead anyways.
453	*/
454
455	object *
456	get_owner (object *op)
457	{
458	if (op->owner == NULL)
459	return NULL;
460
461	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
462	return op->owner;
463
464	op->owner = NULL;
465	op->ownercount = 0;
466	return NULL;
467	}
468
469	void
470	clear_owner (object *op)
471	{
472	if (!op)
473	return;
474
475	if (op->owner && op->ownercount == op->owner->count)
476	op->owner->refcount--;
477
478	op->owner = NULL;
479	op->ownercount = 0;
480	}
481
482	/*
483	* 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
484	* skill and experience objects.	434	* skill and experience objects.
485	*/	435	*/
486	void	436	void
487	set_owner (object *op, object *owner)	437	object::set_owner (object *owner)
488	{	438	{
489	if (owner == NULL || op == NULL)	439	if (!owner)
490	return;	440	return;
491		441
492	/* next line added to allow objects which own objects */	442	/* next line added to allow objects which own objects */
493	/* 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
494	* with the fireball owning a poison cloud which then owned the	444	* with the fireball owning a poison cloud which then owned the
495	* 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
496	* freed and then another object replacing it. Since the ownercounts	446	* freed and then another object replacing it. Since the ownercounts
497	* 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.
498	*/	448	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	449	while (owner->owner)
500	owner = owner->owner;	450	owner = owner->owner;
501		451
502	/* IF the owner still has an owner, we did not resolve to a final owner.
503	* so lets not add to that.
504	*/
505	if (owner->owner)
506	return;
507
508	op->owner = owner;	452	this->owner = owner;
509
510	op->ownercount = owner->count;
511	owner->refcount++;
512	}
513
514	/* Set the owner to clone's current owner and set the skill and experience
515	* objects to clone's objects (typically those objects that where the owner's
516	* current skill and experience objects at the time when clone's owner was
517	* set - not the owner's current skill and experience objects).
518	*
519	* Use this function if player created an object (e.g. fire bullet, swarm
520	* spell), and this object creates further objects whose kills should be
521	* accounted for the player's original skill, even if player has changed
522	* skills meanwhile.
523	*/
524	void
525	copy_owner (object *op, object *clone)
526	{
527	object *owner = get_owner (clone);
528
529	if (owner == NULL)
530	{
531	/* players don't have owners - they own themselves. Update
532	* as appropriate.
533	*/
534	if (clone->type == PLAYER)
535	owner = clone;
536	else
537	return;
538	}
539
540	set_owner (op, owner);
541	}	453	}
542		454
543	/* Zero the key_values on op, decrementing the shared-string	455	/* Zero the key_values on op, decrementing the shared-string
544	* refcounts and freeing the links.	456	* refcounts and freeing the links.
545	*/	457	*/
…		…
561	{	473	{
562	attachable_base::clear ();	474	attachable_base::clear ();
563		475
564	free_key_values (this);	476	free_key_values (this);
565		477
566	clear_owner (this);	478	owner = 0;
567
568	name = 0;	479	name = 0;
569	name_pl = 0;	480	name_pl = 0;
570	title = 0;	481	title = 0;
571	race = 0;	482	race = 0;
572	slaying = 0;	483	slaying = 0;
573	skill = 0;	484	skill = 0;
574	msg = 0;	485	msg = 0;
575	lore = 0;	486	lore = 0;
576	custom_name = 0;	487	custom_name = 0;
577	materialname = 0;	488	materialname = 0;
		489	contr = 0;
		490	below = 0;
		491	above = 0;
		492	inv = 0;
		493	container = 0;
		494	env = 0;
		495	more = 0;
		496	head = 0;
		497	map = 0;
		498	active_next = 0;
		499	active_prev = 0;
578		500
579	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	501	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
580		502
581	SET_FLAG (this, FLAG_REMOVED);	503	SET_FLAG (this, FLAG_REMOVED);
582	}
583		504
584	void object::clone (object *destination)
585	{
586	*(object_copy *) destination = *this;
587	*(object_pod *) destination = *this;
588
589	if (self || cb)
590	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
591	}
592
593	/*
594	* clear_object() frees everything allocated by an object, and also
595	* clears all variables and flags to default settings.
596	*/
597
598	void
599	clear_object (object *op)
600	{
601	op->clear ();
602
603	op->contr = NULL;
604	op->below = NULL;
605	op->above = NULL;
606	op->inv = NULL;
607	op->container = NULL;
608	op->env = NULL;
609	op->more = NULL;
610	op->head = NULL;
611	op->map = NULL;
612	op->refcount = 0;
613	op->active_next = NULL;
614	op->active_prev = NULL;
615	/* What is not cleared is next, prev, and count */	505	/* What is not cleared is next, prev, and count */
616		506
617	op->expmul = 1.0;	507	expmul = 1.0;
618	op->face = blank_face;	508	face = blank_face;
619	op->attacked_by_count = -1;
620		509
621	if (settings.casting_time)	510	if (settings.casting_time)
622	op->casting_time = -1;	511	casting_time = -1;
623	}	512	}
624		513
625	/*	514	/*
626	* copy object first frees everything allocated by the second object,	515	* copy_to first frees everything allocated by the dst object,
627	* and then copies the contends of the first object into the second	516	* and then copies the contents of itself into the second
628	* object, allocating what needs to be allocated. Basically, any	517	* object, allocating what needs to be allocated. Basically, any
629	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	518	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
630	* if the first object is freed, the pointers in the new object	519	* if the first object is freed, the pointers in the new object
631	* will point at garbage.	520	* will point at garbage.
632	*/	521	*/
633
634	void	522	void
635	copy_object (object *op2, object *op)	523	object::copy_to (object *dst)
636	{	524	{
637	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	525	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
638	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	526	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
639		527
640	op2->clone (op);	528	*(object_copy *)dst = *this;
		529	*(object_pod *)dst = *this;
		530
		531	if (self || cb)
		532	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
641		533
642	if (is_freed)	534	if (is_freed)
643	SET_FLAG (op, FLAG_FREED);	535	SET_FLAG (dst, FLAG_FREED);
		536
644	if (is_removed)	537	if (is_removed)
645	SET_FLAG (op, FLAG_REMOVED);	538	SET_FLAG (dst, FLAG_REMOVED);
646		539
647	if (op2->speed < 0)	540	if (speed < 0)
648	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	541	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
649		542
650	/* Copy over key_values, if any. */	543	/* Copy over key_values, if any. */
651	if (op2->key_values)	544	if (key_values)
652	{	545	{
653	key_value *tail = 0;	546	key_value *tail = 0;
654	key_value *i;	547	key_value *i;
655		548
656	op->key_values = 0;	549	dst->key_values = 0;
657		550
658	for (i = op2->key_values; i; i = i->next)	551	for (i = key_values; i; i = i->next)
659	{	552	{
660	key_value *new_link = new key_value;	553	key_value *new_link = new key_value;
661		554
662	new_link->next = 0;	555	new_link->next = 0;
663	new_link->key = i->key;	556	new_link->key = i->key;
664	new_link->value = i->value;	557	new_link->value = i->value;
665		558
666	/* Try and be clever here, too. */	559	/* Try and be clever here, too. */
667	if (!op->key_values)	560	if (!dst->key_values)
668	{	561	{
669	op->key_values = new_link;	562	dst->key_values = new_link;
670	tail = new_link;	563	tail = new_link;
671	}	564	}
672	else	565	else
673	{	566	{
674	tail->next = new_link;	567	tail->next = new_link;
675	tail = new_link;	568	tail = new_link;
676	}	569	}
677	}	570	}
678	}	571	}
679		572
680	update_ob_speed (op);	573	update_ob_speed (dst);
		574	}
		575
		576	object *
		577	object::clone ()
		578	{
		579	object *neu = create ();
		580	copy_to (neu);
		581	return neu;
681	}	582	}
682		583
683	/*	584	/*
684	* If an object with the IS_TURNABLE() flag needs to be turned due	585	* If an object with the IS_TURNABLE() flag needs to be turned due
685	* to the closest player being on the other side, this function can	586	* to the closest player being on the other side, this function can
…		…
698	/*	599	/*
699	* Updates the speed of an object. If the speed changes from 0 to another	600	* Updates the speed of an object. If the speed changes from 0 to another
700	* value, or vice versa, then add/remove the object from the active list.	601	* value, or vice versa, then add/remove the object from the active list.
701	* This function needs to be called whenever the speed of an object changes.	602	* This function needs to be called whenever the speed of an object changes.
702	*/	603	*/
703
704	void	604	void
705	update_ob_speed (object *op)	605	update_ob_speed (object *op)
706	{	606	{
707	extern int arch_init;	607	extern int arch_init;
708		608
…		…
717	abort ();	617	abort ();
718	#else	618	#else
719	op->speed = 0;	619	op->speed = 0;
720	#endif	620	#endif
721	}	621	}
		622
722	if (arch_init)	623	if (arch_init)
723	{
724	return;	624	return;
725	}	625
726	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	626	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
727	{	627	{
728	/* If already on active list, don't do anything */	628	/* If already on active list, don't do anything */
729	if (op->active_next || op->active_prev || op == active_objects)	629	if (op->active_next || op->active_prev || op == active_objects)
730	return;	630	return;
731		631
732	/* process_events() expects us to insert the object at the beginning	632	/* process_events() expects us to insert the object at the beginning
733	* of the list. */	633	* of the list. */
734	op->active_next = active_objects;	634	op->active_next = active_objects;
		635
735	if (op->active_next != NULL)	636	if (op->active_next != NULL)
736	op->active_next->active_prev = op;	637	op->active_next->active_prev = op;
		638
737	active_objects = op;	639	active_objects = op;
738	}	640	}
739	else	641	else
740	{	642	{
741	/* If not on the active list, nothing needs to be done */	643	/* If not on the active list, nothing needs to be done */
…		…
743	return;	645	return;
744		646
745	if (op->active_prev == NULL)	647	if (op->active_prev == NULL)
746	{	648	{
747	active_objects = op->active_next;	649	active_objects = op->active_next;
		650
748	if (op->active_next != NULL)	651	if (op->active_next != NULL)
749	op->active_next->active_prev = NULL;	652	op->active_next->active_prev = NULL;
750	}	653	}
751	else	654	else
752	{	655	{
753	op->active_prev->active_next = op->active_next;	656	op->active_prev->active_next = op->active_next;
		657
754	if (op->active_next)	658	if (op->active_next)
755	op->active_next->active_prev = op->active_prev;	659	op->active_next->active_prev = op->active_prev;
756	}	660	}
		661
757	op->active_next = NULL;	662	op->active_next = NULL;
758	op->active_prev = NULL;	663	op->active_prev = NULL;
759	}	664	}
760	}	665	}
761		666
…		…
789	op->active_next = NULL;	694	op->active_next = NULL;
790	op->active_prev = NULL;	695	op->active_prev = NULL;
791	}	696	}
792		697
793	/*	698	/*
794	* update_object() updates the array which represents the map.	699	* update_object() updates the the map.
795	* It takes into account invisible objects (and represent squares covered	700	* It takes into account invisible objects (and represent squares covered
796	* by invisible objects by whatever is below them (unless it's another	701	* by invisible objects by whatever is below them (unless it's another
797	* invisible object, etc...)	702	* invisible object, etc...)
798	* If the object being updated is beneath a player, the look-window	703	* If the object being updated is beneath a player, the look-window
799	* of that player is updated (this might be a suboptimal way of	704	* of that player is updated (this might be a suboptimal way of
800	* updating that window, though, since update_object() is called _often_)	705	* updating that window, though, since update_object() is called _often_)
801	*	706	*
802	* action is a hint of what the caller believes need to be done.	707	* action is a hint of what the caller believes need to be done.
803	* For example, if the only thing that has changed is the face (due to
804	* an animation), we don't need to call update_position until that actually
805	* comes into view of a player. OTOH, many other things, like addition/removal
806	* of walls or living creatures may need us to update the flags now.
807	* current action are:	708	* current action are:
808	* UP_OBJ_INSERT: op was inserted	709	* UP_OBJ_INSERT: op was inserted
809	* UP_OBJ_REMOVE: op was removed	710	* UP_OBJ_REMOVE: op was removed
810	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	711	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
811	* as that is easier than trying to look at what may have changed.	712	* as that is easier than trying to look at what may have changed.
812	* UP_OBJ_FACE: only the objects face has changed.	713	* UP_OBJ_FACE: only the objects face has changed.
813	*/	714	*/
814
815	void	715	void
816	update_object (object *op, int action)	716	update_object (object *op, int action)
817	{	717	{
818	int update_now = 0, flags;
819	MoveType move_on, move_off, move_block, move_slow;	718	MoveType move_on, move_off, move_block, move_slow;
820		719
821	if (op == NULL)	720	if (op == NULL)
822	{	721	{
823	/* this should never happen */	722	/* this should never happen */
824	LOG (llevDebug, "update_object() called for NULL object.\n");	723	LOG (llevDebug, "update_object() called for NULL object.\n");
825	return;	724	return;
826	}	725	}
827		726
828	if (op->env != NULL)	727	if (op->env)
829	{	728	{
830	/* Animation is currently handled by client, so nothing	729	/* Animation is currently handled by client, so nothing
831	* to do in this case.	730	* to do in this case.
832	*/	731	*/
833	return;	732	return;
…		…
847	abort ();	746	abort ();
848	#endif	747	#endif
849	return;	748	return;
850	}	749	}
851		750
852	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	751	mapspace &m = op->ms ();
853	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
854	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
855	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
856	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
857	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
858		752
		753	if (m.flags_ & P_NEED_UPDATE)
		754	/* nop */;
859	if (action == UP_OBJ_INSERT)	755	else if (action == UP_OBJ_INSERT)
860	{	756	{
		757	// this is likely overkill, TODO: revisit (schmorp)
861	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	758	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
862	update_now = 1;
863
864	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	759	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
865	update_now = 1;	760	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
866		761	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		762	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
867	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	763	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
868	update_now = 1;
869
870	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
871	update_now = 1;
872
873	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
874	update_now = 1;
875
876	if ((move_on | op->move_on) != move_on)	764	|| (m.move_on | op->move_on ) != m.move_on
877	update_now = 1;
878
879	if ((move_off | op->move_off) != move_off)	765	|| (m.move_off | op->move_off ) != m.move_off
880	update_now = 1;	766	|| (m.move_slow | op->move_slow) != m.move_slow
881
882	/* This isn't perfect, but I don't expect a lot of objects to	767	/* This isn't perfect, but I don't expect a lot of objects to
883	* to have move_allow right now.	768	* to have move_allow right now.
884	*/	769	*/
885	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	770	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
886	update_now = 1;	771	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
887		772	m.flags_ = P_NEED_UPDATE;
888	if ((move_slow | op->move_slow) != move_slow)
889	update_now = 1;
890	}	773	}
891	/* if the object is being removed, we can't make intelligent	774	/* if the object is being removed, we can't make intelligent
892	* decisions, because remove_ob can't really pass the object	775	* decisions, because remove_ob can't really pass the object
893	* that is being removed.	776	* that is being removed.
894	*/	777	*/
895	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	778	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
896	{	779	m.flags_ = P_NEED_UPDATE;
897	update_now = 1;
898	}
899	else if (action == UP_OBJ_FACE)	780	else if (action == UP_OBJ_FACE)
900	{
901	/* Nothing to do for that case */	781	/* Nothing to do for that case */ ;
902	}
903	else	782	else
904	{
905	LOG (llevError, "update_object called with invalid action: %d\n", action);	783	LOG (llevError, "update_object called with invalid action: %d\n", action);
906	}
907		784
908	if (update_now)
909	{
910	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
911	update_position (op->map, op->x, op->y);
912	}
913
914	if (op->more != NULL)	785	if (op->more)
915	update_object (op->more, action);	786	update_object (op->more, action);
916	}	787	}
917		788
918	static unordered_vector<object *> mortals;	789	object::vector object::mortals;
919	static std::vector<object *> freed;	790	object::vector object::objects; // not yet used
		791	object *object::first;
920		792
921	void object::free_mortals ()	793	void object::free_mortals ()
922	{	794	{
923	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	795	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
924	if (!(*i)->refcount)	796	if ((*i)->refcnt)
		797	++i; // further delay freeing
		798	else
925	{	799	{
926	freed.push_back (*i);	800	delete *i;
927	mortals.erase (i);	801	mortals.erase (i);
928	}	802	}
929	else
930	++i;
931	}	803	}
932		804
933	object::object ()	805	object::object ()
934	{	806	{
935	SET_FLAG (this, FLAG_REMOVED);	807	SET_FLAG (this, FLAG_REMOVED);
936		808
937	expmul = 1.0;	809	expmul = 1.0;
938	face = blank_face;	810	face = blank_face;
939	attacked_by_count = -1;
940	}	811	}
941		812
942	object::~object ()	813	object::~object ()
943	{	814	{
944	free_key_values (this);	815	free_key_values (this);
945	}	816	}
946		817
947	void object::link ()	818	void object::link ()
948	{	819	{
949	count = ++ob_count;	820	count = ++ob_count;
		821	uuid = gen_uuid ();
950		822
951	prev = 0;	823	prev = 0;
952	next = objects;	824	next = object::first;
953		825
954	if (objects)	826	if (object::first)
955	objects->prev = this;	827	object::first->prev = this;
956		828
957	objects = this;	829	object::first = this;
958	}	830	}
959		831
960	void object::unlink ()	832	void object::unlink ()
961	{	833	{
962	count = 0;	834	if (this == object::first)
		835	object::first = next;
963		836
964	/* Remove this object from the list of used objects */	837	/* Remove this object from the list of used objects */
965	if (prev)
966	{
967	prev->next = next;	838	if (prev) prev->next = next;
		839	if (next) next->prev = prev;
		840
968	prev = 0;	841	prev = 0;
969	}
970
971	if (next)
972	{
973	next->prev = prev;
974	next = 0;	842	next = 0;
975	}
976
977	if (this == objects)
978	objects = next;
979	}	843	}
980		844
981	object *object::create ()	845	object *object::create ()
982	{	846	{
983	object *op;
984
985	if (freed.empty ())
986	op = new object;	847	object *op = new object;
987	else
988	{
989	// highly annoying, but the only way to get it stable right now
990	op = freed.back (); freed.pop_back ();
991	op->~object ();
992	new ((void *)op) object;
993	}
994
995	op->link ();	848	op->link ();
996	return op;	849	return op;
997	}	850	}
998		851
999	/*	852	/*
…		…
1001	* it from the list of used objects, and puts it on the list of	854	* it from the list of used objects, and puts it on the list of
1002	* free objects. The IS_FREED() flag is set in the object.	855	* free objects. The IS_FREED() flag is set in the object.
1003	* The object must have been removed by remove_ob() first for	856	* The object must have been removed by remove_ob() first for
1004	* this function to succeed.	857	* this function to succeed.
1005	*	858	*
1006	* If free_inventory is set, free inventory as well. Else drop items in	859	* If destroy_inventory is set, free inventory as well. Else drop items in
1007	* inventory to the ground.	860	* inventory to the ground.
1008	*/	861	*/
1009	void object::free (bool free_inventory)	862	void object::destroy (bool destroy_inventory)
1010	{	863	{
		864	if (QUERY_FLAG (this, FLAG_FREED))
		865	return;
		866
		867	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		868	remove_friendly_object (this);
		869
1011	if (!QUERY_FLAG (this, FLAG_REMOVED))	870	if (!QUERY_FLAG (this, FLAG_REMOVED))
1012	{	871	remove ();
1013	LOG (llevDebug, "Free object called with non removed object\n");
1014	dump_object (this);
1015	#ifdef MANY_CORES
1016	abort ();
1017	#endif
1018	}
1019		872
1020	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1021	{
1022	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1023	remove_friendly_object (this);
1024	}
1025
1026	if (QUERY_FLAG (this, FLAG_FREED))	873	SET_FLAG (this, FLAG_FREED);
1027	{
1028	dump_object (this);
1029	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1030	return;
1031	}
1032		874
1033	if (more)	875	if (more)
1034	{	876	{
1035	more->free (free_inventory);	877	more->destroy (destroy_inventory);
1036	more = 0;	878	more = 0;
1037	}	879	}
1038		880
1039	if (inv)	881	if (inv)
1040	{	882	{
1041	/* Only if the space blocks everything do we not process -	883	/* Only if the space blocks everything do we not process -
1042	* if some form of movement is allowed, let objects	884	* if some form of movement is allowed, let objects
1043	* drop on that space.	885	* drop on that space.
1044	*/	886	*/
1045	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	887	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1046	{	888	{
1047	object *	889	object *op = inv;
1048	op = inv;
1049		890
1050	while (op)	891	while (op)
1051	{	892	{
1052	object *
1053	tmp = op->below;	893	object *tmp = op->below;
1054
1055	remove_ob (op);
1056	op->free (free_inventory);	894	op->destroy (destroy_inventory);
1057	op = tmp;	895	op = tmp;
1058	}	896	}
1059	}	897	}
1060	else	898	else
1061	{ /* Put objects in inventory onto this space */	899	{ /* Put objects in inventory onto this space */
1062	object *	900	object *op = inv;
1063	op = inv;
1064		901
1065	while (op)	902	while (op)
1066	{	903	{
1067	object *
1068	tmp = op->below;	904	object *tmp = op->below;
1069		905
1070	remove_ob (op);	906	op->remove ();
1071		907
1072	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	908	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1073	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	909	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1074	free_object (op);	910	op->destroy ();
1075	else	911	else
1076	{	912	{
1077	op->x = x;	913	op->x = x;
1078	op->y = y;	914	op->y = y;
1079	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	915	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
1082	op = tmp;	918	op = tmp;
1083	}	919	}
1084	}	920	}
1085	}	921	}
1086		922
1087	clear_owner (this);	923	// hack to ensure that freed objects still have a valid map
		924	{
		925	static maptile *freed_map; // freed objects are moved here to avoid crashes
		926
		927	if (!freed_map)
		928	{
		929	freed_map = new maptile;
		930
		931	freed_map->name = "/internal/freed_objects_map";
		932	freed_map->width = 3;
		933	freed_map->height = 3;
		934
		935	freed_map->allocate ();
		936	}
		937
		938	map = freed_map;
		939	x = 1;
		940	y = 1;
		941	}
		942
		943	// clear those pointers that likely might have circular references to us
		944	owner = 0;
		945	enemy = 0;
		946	attacked_by = 0;
		947
		948	// only relevant for players(?), but make sure of it anyways
		949	contr = 0;
1088		950
1089	/* Remove object from the active list */	951	/* Remove object from the active list */
1090	speed = 0;	952	speed = 0;
1091	update_ob_speed (this);	953	update_ob_speed (this);
1092		954
1093	unlink ();	955	unlink ();
1094		956
1095	SET_FLAG (this, FLAG_FREED);
1096
1097	mortals.push_back (this);	957	mortals.push_back (this);
1098	}	958	}
1099		959
1100	/*	960	/*
1101	* sub_weight() recursively (outwards) subtracts a number from the	961	* sub_weight() recursively (outwards) subtracts a number from the
1102	* weight of an object (and what is carried by it's environment(s)).	962	* weight of an object (and what is carried by it's environment(s)).
1103	*/	963	*/
1104
1105	void	964	void
1106	sub_weight (object *op, signed long weight)	965	sub_weight (object *op, signed long weight)
1107	{	966	{
1108	while (op != NULL)	967	while (op != NULL)
1109	{	968	{
1110	if (op->type == CONTAINER)	969	if (op->type == CONTAINER)
1111	{
1112	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	970	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1113	}	971
1114	op->carrying -= weight;	972	op->carrying -= weight;
1115	op = op->env;	973	op = op->env;
1116	}	974	}
1117	}	975	}
1118		976
1119	/* remove_ob(op):	977	/* op->remove ():
1120	* This function removes the object op from the linked list of objects	978	* This function removes the object op from the linked list of objects
1121	* which it is currently tied to. When this function is done, the	979	* which it is currently tied to. When this function is done, the
1122	* object will have no environment. If the object previously had an	980	* object will have no environment. If the object previously had an
1123	* environment, the x and y coordinates will be updated to	981	* environment, the x and y coordinates will be updated to
1124	* the previous environment.	982	* the previous environment.
1125	* Beware: This function is called from the editor as well!	983	* Beware: This function is called from the editor as well!
1126	*/	984	*/
1127
1128	void	985	void
1129	remove_ob (object *op)	986	object::remove ()
1130	{	987	{
		988	object *tmp, *last = 0;
1131	object *	989	object *otmp;
1132	tmp, *	990
1133	last = NULL;
1134	object *
1135	otmp;
1136	tag_t
1137	tag;
1138	int
1139	check_walk_off;	991	int check_walk_off;
1140	mapstruct *
1141	m;
1142	sint16
1143	x,
1144	y;
1145		992
1146
1147	if (QUERY_FLAG (op, FLAG_REMOVED))	993	if (QUERY_FLAG (this, FLAG_REMOVED))
1148	{	994	return;
1149	dump_object (op);
1150	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1151		995
1152	/* Changed it to always dump core in this case. As has been learned
1153	* in the past, trying to recover from errors almost always
1154	* make things worse, and this is a real error here - something
1155	* that should not happen.
1156	* Yes, if this was a mission critical app, trying to do something
1157	* to recover may make sense, but that is because failure of the app
1158	* may have other disastrous problems. Cf runs out of a script
1159	* so is easily enough restarted without any real problems.
1160	* MSW 2001-07-01
1161	*/
1162	abort ();
1163	}
1164	if (op->more != NULL)
1165	remove_ob (op->more);
1166
1167	SET_FLAG (op, FLAG_REMOVED);	996	SET_FLAG (this, FLAG_REMOVED);
		997
		998	if (more)
		999	more->remove ();
1168		1000
1169	/*	1001	/*
1170	* In this case, the object to be removed is in someones	1002	* In this case, the object to be removed is in someones
1171	* inventory.	1003	* inventory.
1172	*/	1004	*/
1173	if (op->env != NULL)	1005	if (env)
1174	{	1006	{
1175	if (op->nrof)	1007	if (nrof)
1176	sub_weight (op->env, op->weight * op->nrof);	1008	sub_weight (env, weight * nrof);
1177	else	1009	else
1178	sub_weight (op->env, op->weight + op->carrying);	1010	sub_weight (env, weight + carrying);
1179		1011
1180	/* NO_FIX_PLAYER is set when a great many changes are being	1012	/* NO_FIX_PLAYER is set when a great many changes are being
1181	* made to players inventory. If set, avoiding the call	1013	* made to players inventory. If set, avoiding the call
1182	* to save cpu time.	1014	* to save cpu time.
1183	*/	1015	*/
1184	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1016	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1185	fix_player (otmp);	1017	fix_player (otmp);
1186		1018
1187	if (op->above != NULL)	1019	if (above != NULL)
1188	op->above->below = op->below;	1020	above->below = below;
1189	else	1021	else
1190	op->env->inv = op->below;	1022	env->inv = below;
1191		1023
1192	if (op->below != NULL)	1024	if (below != NULL)
1193	op->below->above = op->above;	1025	below->above = above;
1194		1026
1195	/* we set up values so that it could be inserted into	1027	/* we set up values so that it could be inserted into
1196	* the map, but we don't actually do that - it is up	1028	* the map, but we don't actually do that - it is up
1197	* to the caller to decide what we want to do.	1029	* to the caller to decide what we want to do.
1198	*/	1030	*/
1199	op->x = op->env->x, op->y = op->env->y;	1031	x = env->x, y = env->y;
1200	op->map = op->env->map;	1032	map = env->map;
1201	op->above = NULL, op->below = NULL;	1033	above = 0, below = 0;
1202	op->env = NULL;	1034	env = 0;
1203	return;
1204	}
1205
1206	/* If we get here, we are removing it from a map */
1207	if (op->map == NULL)
1208	return;
1209
1210	x = op->x;
1211	y = op->y;
1212	m = get_map_from_coord (op->map, &x, &y);
1213
1214	if (!m)
1215	{	1035	}
1216	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1036	else if (map)
1217	op->map->path, op->x, op->y);	1037	{
1218	/* in old days, we used to set x and y to 0 and continue.	1038	/* Re did the following section of code - it looks like it had
1219	* it seems if we get into this case, something is probablye	1039	* lots of logic for things we no longer care about
1220	* screwed up and should be fixed.
1221	*/	1040	*/
1222	abort ();
1223	}
1224	if (op->map != m)
1225	{
1226	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1227	op->map->path, m->path, op->x, op->y, x, y);
1228	}
1229		1041
1230	/* Re did the following section of code - it looks like it had
1231	* lots of logic for things we no longer care about
1232	*/
1233
1234	/* link the object above us */	1042	/* link the object above us */
1235	if (op->above)	1043	if (above)
1236	op->above->below = op->below;	1044	above->below = below;
1237	else	1045	else
1238	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1046	map->at (x, y).top = below; /* we were top, set new top */
1239		1047
1240	/* Relink the object below us, if there is one */	1048	/* Relink the object below us, if there is one */
1241	if (op->below)	1049	if (below)
1242	{
1243	op->below->above = op->above;	1050	below->above = above;
1244	}
1245	else	1051	else
1246	{
1247	/* Nothing below, which means we need to relink map object for this space
1248	* use translated coordinates in case some oddness with map tiling is
1249	* evident
1250	*/
1251	if (GET_MAP_OB (m, x, y) != op)
1252	{	1052	{
1253	dump_object (op);	1053	/* Nothing below, which means we need to relink map object for this space
		1054	* use translated coordinates in case some oddness with map tiling is
		1055	* evident
		1056	*/
		1057	if (GET_MAP_OB (map, x, y) != this)
		1058	{
		1059	char *dump = dump_object (this);
		1060	LOG (llevError,
1254	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",	1061	"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);
1255	errmsg);	1062	free (dump);
1256	dump_object (GET_MAP_OB (m, x, y));	1063	dump = dump_object (GET_MAP_OB (map, x, y));
1257	LOG (llevError, "%s\n", errmsg);	1064	LOG (llevError, "%s\n", dump);
		1065	free (dump);
		1066	}
		1067
		1068	map->at (x, y).bottom = above; /* goes on above it. */
1258	}	1069	}
1259	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1260	}
1261	op->above = NULL;
1262	op->below = NULL;
1263		1070
		1071	above = 0;
		1072	below = 0;
		1073
1264	if (op->map->in_memory == MAP_SAVING)	1074	if (map->in_memory == MAP_SAVING)
1265	return;	1075	return;
1266		1076
1267	tag = op->count;
1268	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1077	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
		1078
1269	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1079	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1270	{
1271	/* No point updating the players look faces if he is the object
1272	* being removed.
1273	*/
1274
1275	if (tmp->type == PLAYER && tmp != op)
1276	{	1080	{
1277	/* If a container that the player is currently using somehow gets	1081	/* No point updating the players look faces if he is the object
1278	* removed (most likely destroyed), update the player view	1082	* being removed.
1279	* appropriately.
1280	*/	1083	*/
1281	if (tmp->container == op)	1084
		1085	if (tmp->type == PLAYER && tmp != this)
1282	{	1086	{
		1087	/* If a container that the player is currently using somehow gets
		1088	* removed (most likely destroyed), update the player view
		1089	* appropriately.
		1090	*/
		1091	if (tmp->container == this)
		1092	{
1283	CLEAR_FLAG (op, FLAG_APPLIED);	1093	CLEAR_FLAG (this, FLAG_APPLIED);
1284	tmp->container = NULL;	1094	tmp->container = 0;
		1095	}
		1096
		1097	tmp->contr->socket->floorbox_update ();
1285	}	1098	}
1286	tmp->contr->socket.update_look = 1;	1099
		1100	/* See if player moving off should effect something */
		1101	if (check_walk_off
		1102	&& ((move_type & tmp->move_off)
		1103	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1104	{
		1105	move_apply (tmp, this, 0);
		1106
		1107	if (destroyed ())
		1108	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
		1109	}
		1110
		1111	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
		1112
		1113	if (tmp->above == tmp)
		1114	tmp->above = 0;
		1115
		1116	last = tmp;
1287	}	1117	}
1288	/* See if player moving off should effect something */
1289	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1290	{
1291		1118
1292	move_apply (tmp, op, NULL);
1293	if (was_destroyed (op, tag))
1294	{
1295	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
1296	}
1297	}
1298
1299	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1300
1301	if (tmp->above == tmp)
1302	tmp->above = NULL;
1303	last = tmp;
1304	}
1305	/* last == NULL of there are no objects on this space */	1119	/* last == NULL of there are no objects on this space */
1306	if (last == NULL)	1120	if (!last)
1307	{	1121	map->at (x, y).flags_ = P_NEED_UPDATE;
1308	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1309	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1310	* those out anyways, and if there are any flags set right now, they won't
1311	* be correct anyways.
1312	*/
1313	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1314	update_position (op->map, op->x, op->y);
1315	}
1316	else	1122	else
1317	update_object (last, UP_OBJ_REMOVE);	1123	update_object (last, UP_OBJ_REMOVE);
1318		1124
1319	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1125	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1320	update_all_los (op->map, op->x, op->y);	1126	update_all_los (map, x, y);
1321		1127	}
1322	}	1128	}
1323		1129
1324	/*	1130	/*
1325	* merge_ob(op,top):	1131	* merge_ob(op,top):
1326	*	1132	*
1327	* This function goes through all objects below and including top, and	1133	* This function goes through all objects below and including top, and
1328	* merges op to the first matching object.	1134	* merges op to the first matching object.
1329	* If top is NULL, it is calculated.	1135	* If top is NULL, it is calculated.
1330	* Returns pointer to object if it succeded in the merge, otherwise NULL	1136	* Returns pointer to object if it succeded in the merge, otherwise NULL
1331	*/	1137	*/
1332
1333	object *	1138	object *
1334	merge_ob (object *op, object *top)	1139	merge_ob (object *op, object *top)
1335	{	1140	{
1336	if (!op->nrof)	1141	if (!op->nrof)
1337	return 0;	1142	return 0;
		1143
1338	if (top == NULL)	1144	if (top == NULL)
1339	for (top = op; top != NULL && top->above != NULL; top = top->above);	1145	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1146
1340	for (; top != NULL; top = top->below)	1147	for (; top != NULL; top = top->below)
1341	{	1148	{
1342	if (top == op)	1149	if (top == op)
1343	continue;	1150	continue;
1344	if (CAN_MERGE (op, top))	1151
		1152	if (object::can_merge (op, top))
1345	{	1153	{
1346	top->nrof += op->nrof;	1154	top->nrof += op->nrof;
1347		1155
1348	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1156	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1349	op->weight = 0; /* Don't want any adjustements now */	1157	op->weight = 0; /* Don't want any adjustements now */
1350	remove_ob (op);	1158	op->destroy ();
1351	free_object (op);
1352	return top;	1159	return top;
1353	}	1160	}
1354	}	1161	}
		1162
1355	return NULL;	1163	return 0;
1356	}	1164	}
1357		1165
1358	/*	1166	/*
1359	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1167	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1360	* job preparing multi-part monsters	1168	* job preparing multi-part monsters
1361	*/	1169	*/
1362	object *	1170	object *
1363	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1171	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1364	{	1172	{
1365	object *	1173	object *tmp;
1366	tmp;
1367		1174
1368	if (op->head)	1175	if (op->head)
1369	op = op->head;	1176	op = op->head;
		1177
1370	for (tmp = op; tmp; tmp = tmp->more)	1178	for (tmp = op; tmp; tmp = tmp->more)
1371	{	1179	{
1372	tmp->x = x + tmp->arch->clone.x;	1180	tmp->x = x + tmp->arch->clone.x;
1373	tmp->y = y + tmp->arch->clone.y;	1181	tmp->y = y + tmp->arch->clone.y;
1374	}	1182	}
		1183
1375	return insert_ob_in_map (op, m, originator, flag);	1184	return insert_ob_in_map (op, m, originator, flag);
1376	}	1185	}
1377		1186
1378	/*	1187	/*
1379	* insert_ob_in_map (op, map, originator, flag):	1188	* insert_ob_in_map (op, map, originator, flag):
…		…
1395	* NULL if 'op' was destroyed	1204	* NULL if 'op' was destroyed
1396	* just 'op' otherwise	1205	* just 'op' otherwise
1397	*/	1206	*/
1398		1207
1399	object *	1208	object *
1400	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1209	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1401	{	1210	{
1402	object *tmp, *top, *floor = NULL;	1211	object *tmp, *top, *floor = NULL;
1403	sint16 x, y;	1212	sint16 x, y;
1404		1213
1405	if (QUERY_FLAG (op, FLAG_FREED))	1214	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1408	return NULL;	1217	return NULL;
1409	}	1218	}
1410		1219
1411	if (m == NULL)	1220	if (m == NULL)
1412	{	1221	{
1413	dump_object (op);	1222	char *dump = dump_object (op);
1414	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1223	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1224	free (dump);
1415	return op;	1225	return op;
1416	}	1226	}
1417		1227
1418	if (out_of_map (m, op->x, op->y))	1228	if (out_of_map (m, op->x, op->y))
1419	{	1229	{
1420	dump_object (op);	1230	char *dump = dump_object (op);
1421	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1231	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1422	#ifdef MANY_CORES	1232	#ifdef MANY_CORES
1423	/* Better to catch this here, as otherwise the next use of this object	1233	/* Better to catch this here, as otherwise the next use of this object
1424	* is likely to cause a crash. Better to find out where it is getting	1234	* is likely to cause a crash. Better to find out where it is getting
1425	* improperly inserted.	1235	* improperly inserted.
1426	*/	1236	*/
1427	abort ();	1237	abort ();
1428	#endif	1238	#endif
		1239	free (dump);
1429	return op;	1240	return op;
1430	}	1241	}
1431		1242
1432	if (!QUERY_FLAG (op, FLAG_REMOVED))	1243	if (!QUERY_FLAG (op, FLAG_REMOVED))
1433	{	1244	{
1434	dump_object (op);	1245	char *dump = dump_object (op);
1435	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1246	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1247	free (dump);
1436	return op;	1248	return op;
1437	}	1249	}
1438		1250
1439	if (op->more != NULL)	1251	if (op->more != NULL)
1440	{	1252	{
1441	/* The part may be on a different map. */	1253	/* The part may be on a different map. */
1442		1254
1443	object *
1444	more = op->more;	1255	object *more = op->more;
1445		1256
1446	/* We really need the caller to normalize coordinates - if	1257	/* We really need the caller to normalize coordinates - if
1447	* we set the map, that doesn't work if the location is within	1258	* we set the map, that doesn't work if the location is within
1448	* a map and this is straddling an edge. So only if coordinate	1259	* a map and this is straddling an edge. So only if coordinate
1449	* is clear wrong do we normalize it.	1260	* is clear wrong do we normalize it.
1450	*/	1261	*/
1451	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1262	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1452	{
1453	more->map = get_map_from_coord (m, &more->x, &more->y);	1263	more->map = get_map_from_coord (m, &more->x, &more->y);
1454	}
1455	else if (!more->map)	1264	else if (!more->map)
1456	{	1265	{
1457	/* For backwards compatibility - when not dealing with tiled maps,	1266	/* For backwards compatibility - when not dealing with tiled maps,
1458	* more->map should always point to the parent.	1267	* more->map should always point to the parent.
1459	*/	1268	*/
…		…
1462		1271
1463	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1272	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1464	{	1273	{
1465	if (!op->head)	1274	if (!op->head)
1466	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1275	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
		1276
1467	return NULL;	1277	return NULL;
1468	}	1278	}
1469	}	1279	}
1470		1280
1471	CLEAR_FLAG (op, FLAG_REMOVED);	1281	CLEAR_FLAG (op, FLAG_REMOVED);
…		…
1480		1290
1481	/* this has to be done after we translate the coordinates.	1291	/* this has to be done after we translate the coordinates.
1482	*/	1292	*/
1483	if (op->nrof && !(flag & INS_NO_MERGE))	1293	if (op->nrof && !(flag & INS_NO_MERGE))
1484	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1294	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1485	if (CAN_MERGE (op, tmp))	1295	if (object::can_merge (op, tmp))
1486	{	1296	{
1487	op->nrof += tmp->nrof;	1297	op->nrof += tmp->nrof;
1488	remove_ob (tmp);	1298	tmp->destroy ();
1489	free_object (tmp);
1490	}	1299	}
1491		1300
1492	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1301	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1493	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1302	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1494		1303
…		…
1507	op->below = originator->below;	1316	op->below = originator->below;
1508		1317
1509	if (op->below)	1318	if (op->below)
1510	op->below->above = op;	1319	op->below->above = op;
1511	else	1320	else
1512	SET_MAP_OB (op->map, op->x, op->y, op);	1321	op->ms ().bottom = op;
1513		1322
1514	/* since *below* originator, no need to update top */	1323	/* since *below* originator, no need to update top */
1515	originator->below = op;	1324	originator->below = op;
1516	}	1325	}
1517	else	1326	else
…		…
1536		1345
1537	while (top != NULL)	1346	while (top != NULL)
1538	{	1347	{
1539	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1348	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1540	floor = top;	1349	floor = top;
		1350
1541	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1351	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1542	{	1352	{
1543	/* We insert above top, so we want this object below this */	1353	/* We insert above top, so we want this object below this */
1544	top = top->below;	1354	top = top->below;
1545	break;	1355	break;
1546	}	1356	}
		1357
1547	last = top;	1358	last = top;
1548	top = top->above;	1359	top = top->above;
1549	}	1360	}
		1361
1550	/* Don't want top to be NULL, so set it to the last valid object */	1362	/* Don't want top to be NULL, so set it to the last valid object */
1551	top = last;	1363	top = last;
1552		1364
1553	/* We let update_position deal with figuring out what the space	1365	/* We let update_position deal with figuring out what the space
1554	* looks like instead of lots of conditions here.	1366	* looks like instead of lots of conditions here.
…		…
1560	* If INS_ON_TOP is used, don't do this processing	1372	* If INS_ON_TOP is used, don't do this processing
1561	* Need to find the object that in fact blocks view, otherwise	1373	* Need to find the object that in fact blocks view, otherwise
1562	* stacking is a bit odd.	1374	* stacking is a bit odd.
1563	*/	1375	*/
1564	if (!(flag & INS_ON_TOP) &&	1376	if (!(flag & INS_ON_TOP) &&
1565	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1377	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1566	{	1378	{
1567	for (last = top; last != floor; last = last->below)	1379	for (last = top; last != floor; last = last->below)
1568	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1380	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1569	break;	1381	break;
1570	/* Check to see if we found the object that blocks view,	1382	/* Check to see if we found the object that blocks view,
…		…
1593		1405
1594	if (op->above)	1406	if (op->above)
1595	op->above->below = op;	1407	op->above->below = op;
1596		1408
1597	op->below = NULL;	1409	op->below = NULL;
1598	SET_MAP_OB (op->map, op->x, op->y, op);	1410	op->ms ().bottom = op;
1599	}	1411	}
1600	else	1412	else
1601	{ /* get inserted into the stack above top */	1413	{ /* get inserted into the stack above top */
1602	op->above = top->above;	1414	op->above = top->above;
1603		1415
…		…
1607	op->below = top;	1419	op->below = top;
1608	top->above = op;	1420	top->above = op;
1609	}	1421	}
1610		1422
1611	if (op->above == NULL)	1423	if (op->above == NULL)
1612	SET_MAP_TOP (op->map, op->x, op->y, op);	1424	op->ms ().top = op;
1613	} /* else not INS_BELOW_ORIGINATOR */	1425	} /* else not INS_BELOW_ORIGINATOR */
1614		1426
1615	if (op->type == PLAYER)	1427	if (op->type == PLAYER)
1616	op->contr->do_los = 1;	1428	op->contr->do_los = 1;
1617		1429
1618	/* If we have a floor, we know the player, if any, will be above	1430	/* If we have a floor, we know the player, if any, will be above
1619	* it, so save a few ticks and start from there.	1431	* it, so save a few ticks and start from there.
1620	*/	1432	*/
1621	if (!(flag & INS_MAP_LOAD))	1433	if (!(flag & INS_MAP_LOAD))
1622	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1434	if (object *pl = op->ms ().player ())
1623	if (tmp->type == PLAYER)	1435	pl->contr->socket->floorbox_update ();
1624	tmp->contr->socket.update_look = 1;
1625		1436
1626	/* If this object glows, it may affect lighting conditions that are	1437	/* If this object glows, it may affect lighting conditions that are
1627	* visible to others on this map. But update_all_los is really	1438	* visible to others on this map. But update_all_los is really
1628	* an inefficient way to do this, as it means los for all players	1439	* an inefficient way to do this, as it means los for all players
1629	* on the map will get recalculated. The players could very well	1440	* on the map will get recalculated. The players could very well
…		…
1633	* of effect may be sufficient.	1444	* of effect may be sufficient.
1634	*/	1445	*/
1635	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1446	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))
1636	update_all_los (op->map, op->x, op->y);	1447	update_all_los (op->map, op->x, op->y);
1637		1448
1638
1639	/* updates flags (blocked, alive, no magic, etc) for this map space */	1449	/* updates flags (blocked, alive, no magic, etc) for this map space */
1640	update_object (op, UP_OBJ_INSERT);	1450	update_object (op, UP_OBJ_INSERT);
1641		1451
1642
1643	/* Don't know if moving this to the end will break anything. However,	1452	/* Don't know if moving this to the end will break anything. However,
1644	* we want to have update_look set above before calling this.	1453	* we want to have floorbox_update called before calling this.
1645	*	1454	*
1646	* check_move_on() must be after this because code called from	1455	* check_move_on() must be after this because code called from
1647	* check_move_on() depends on correct map flags (so functions like	1456	* check_move_on() depends on correct map flags (so functions like
1648	* blocked() and wall() work properly), and these flags are updated by	1457	* blocked() and wall() work properly), and these flags are updated by
1649	* update_object().	1458	* update_object().
…		…
1665		1474
1666	return op;	1475	return op;
1667	}	1476	}
1668		1477
1669	/* this function inserts an object in the map, but if it	1478	/* this function inserts an object in the map, but if it
1670	* finds an object of its own type, it'll remove that one first.	1479	* finds an object of its own type, it'll remove that one first.
1671	* op is the object to insert it under: supplies x and the map.	1480	* op is the object to insert it under: supplies x and the map.
1672	*/	1481	*/
1673	void	1482	void
1674	replace_insert_ob_in_map (const char *arch_string, object *op)	1483	replace_insert_ob_in_map (const char *arch_string, object *op)
1675	{	1484	{
1676	object *tmp;
1677	object *tmp1;	1485	object *tmp, *tmp1;
1678		1486
1679	/* first search for itself and remove any old instances */	1487	/* first search for itself and remove any old instances */
1680		1488
1681	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1489	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1682	{
1683	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1490	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1684	{	1491	tmp->destroy ();
1685	remove_ob (tmp);
1686	free_object (tmp);
1687	}
1688	}
1689		1492
1690	tmp1 = arch_to_object (find_archetype (arch_string));	1493	tmp1 = arch_to_object (archetype::find (arch_string));
1691		1494
1692	tmp1->x = op->x;	1495	tmp1->x = op->x;
1693	tmp1->y = op->y;	1496	tmp1->y = op->y;
1694	insert_ob_in_map (tmp1, op->map, op, 0);	1497	insert_ob_in_map (tmp1, op->map, op, 0);
1695	}	1498	}
…		…
1703	*/	1506	*/
1704		1507
1705	object *	1508	object *
1706	get_split_ob (object *orig_ob, uint32 nr)	1509	get_split_ob (object *orig_ob, uint32 nr)
1707	{	1510	{
1708	object *	1511	object *newob;
1709	newob;
1710	int
1711	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1512	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1712		1513
1713	if (orig_ob->nrof < nr)	1514	if (orig_ob->nrof < nr)
1714	{	1515	{
1715	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1516	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1716	return NULL;	1517	return NULL;
1717	}	1518	}
		1519
1718	newob = object_create_clone (orig_ob);	1520	newob = object_create_clone (orig_ob);
		1521
1719	if ((orig_ob->nrof -= nr) < 1)	1522	if ((orig_ob->nrof -= nr) < 1)
1720	{	1523	orig_ob->destroy (1);
1721	if (!is_removed)
1722	remove_ob (orig_ob);
1723	free_object2 (orig_ob, 1);
1724	}
1725	else if (!is_removed)	1524	else if (!is_removed)
1726	{	1525	{
1727	if (orig_ob->env != NULL)	1526	if (orig_ob->env != NULL)
1728	sub_weight (orig_ob->env, orig_ob->weight * nr);	1527	sub_weight (orig_ob->env, orig_ob->weight * nr);
1729	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1528	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1731	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1530	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1732	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1531	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1733	return NULL;	1532	return NULL;
1734	}	1533	}
1735	}	1534	}
		1535
1736	newob->nrof = nr;	1536	newob->nrof = nr;
1737		1537
1738	return newob;	1538	return newob;
1739	}	1539	}
1740		1540
…		…
1747	*/	1547	*/
1748		1548
1749	object *	1549	object *
1750	decrease_ob_nr (object *op, uint32 i)	1550	decrease_ob_nr (object *op, uint32 i)
1751	{	1551	{
1752	object *	1552	object *tmp;
1753	tmp;
1754	player *	1553	player *pl;
1755	pl;
1756		1554
1757	if (i == 0) /* objects with op->nrof require this check */	1555	if (i == 0) /* objects with op->nrof require this check */
1758	return op;	1556	return op;
1759		1557
1760	if (i > op->nrof)	1558	if (i > op->nrof)
1761	i = op->nrof;	1559	i = op->nrof;
1762		1560
1763	if (QUERY_FLAG (op, FLAG_REMOVED))	1561	if (QUERY_FLAG (op, FLAG_REMOVED))
1764	{
1765	op->nrof -= i;	1562	op->nrof -= i;
1766	}
1767	else if (op->env != NULL)	1563	else if (op->env)
1768	{	1564	{
1769	/* is this object in the players inventory, or sub container	1565	/* is this object in the players inventory, or sub container
1770	* therein?	1566	* therein?
1771	*/	1567	*/
1772	tmp = is_player_inv (op->env);	1568	tmp = op->in_player ();
1773	/* nope. Is this a container the player has opened?	1569	/* nope. Is this a container the player has opened?
1774	* If so, set tmp to that player.	1570	* If so, set tmp to that player.
1775	* IMO, searching through all the players will mostly	1571	* IMO, searching through all the players will mostly
1776	* likely be quicker than following op->env to the map,	1572	* likely be quicker than following op->env to the map,
1777	* and then searching the map for a player.	1573	* and then searching the map for a player.
1778	*/	1574	*/
1779	if (!tmp)	1575	if (!tmp)
1780	{	1576	{
1781	for (pl = first_player; pl; pl = pl->next)	1577	for (pl = first_player; pl; pl = pl->next)
1782	if (pl->ob->container == op->env)	1578	if (pl->ob->container == op->env)
		1579	{
		1580	tmp = pl->ob;
1783	break;	1581	break;
1784	if (pl)	1582	}
1785	tmp = pl->ob;
1786	else
1787	tmp = NULL;
1788	}	1583	}
1789		1584
1790	if (i < op->nrof)	1585	if (i < op->nrof)
1791	{	1586	{
1792	sub_weight (op->env, op->weight * i);	1587	sub_weight (op->env, op->weight * i);
1793	op->nrof -= i;	1588	op->nrof -= i;
1794	if (tmp)	1589	if (tmp)
1795	{
1796	esrv_send_item (tmp, op);	1590	esrv_send_item (tmp, op);
1797	}
1798	}	1591	}
1799	else	1592	else
1800	{	1593	{
1801	remove_ob (op);	1594	op->remove ();
1802	op->nrof = 0;	1595	op->nrof = 0;
1803	if (tmp)	1596	if (tmp)
1804	{
1805	esrv_del_item (tmp->contr, op->count);	1597	esrv_del_item (tmp->contr, op->count);
1806	}
1807	}	1598	}
1808	}	1599	}
1809	else	1600	else
1810	{	1601	{
1811	object *
1812	above = op->above;	1602	object *above = op->above;
1813		1603
1814	if (i < op->nrof)	1604	if (i < op->nrof)
1815	{
1816	op->nrof -= i;	1605	op->nrof -= i;
1817	}
1818	else	1606	else
1819	{	1607	{
1820	remove_ob (op);	1608	op->remove ();
1821	op->nrof = 0;	1609	op->nrof = 0;
1822	}	1610	}
		1611
1823	/* Since we just removed op, op->above is null */	1612	/* Since we just removed op, op->above is null */
1824	for (tmp = above; tmp != NULL; tmp = tmp->above)	1613	for (tmp = above; tmp; tmp = tmp->above)
1825	if (tmp->type == PLAYER)	1614	if (tmp->type == PLAYER)
1826	{	1615	{
1827	if (op->nrof)	1616	if (op->nrof)
1828	esrv_send_item (tmp, op);	1617	esrv_send_item (tmp, op);
1829	else	1618	else
1830	esrv_del_item (tmp->contr, op->count);	1619	esrv_del_item (tmp->contr, op->count);
1831	}	1620	}
1832	}	1621	}
1833		1622
1834	if (op->nrof)	1623	if (op->nrof)
1835	{
1836	return op;	1624	return op;
1837	}
1838	else	1625	else
1839	{	1626	{
1840	free_object (op);	1627	op->destroy ();
1841	return NULL;	1628	return 0;
1842	}	1629	}
1843	}	1630	}
1844		1631
1845	/*	1632	/*
1846	* add_weight(object, weight) adds the specified weight to an object,	1633	* add_weight(object, weight) adds the specified weight to an object,
…		…
1851	add_weight (object *op, signed long weight)	1638	add_weight (object *op, signed long weight)
1852	{	1639	{
1853	while (op != NULL)	1640	while (op != NULL)
1854	{	1641	{
1855	if (op->type == CONTAINER)	1642	if (op->type == CONTAINER)
1856	{
1857	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1643	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1858	}	1644
1859	op->carrying += weight;	1645	op->carrying += weight;
1860	op = op->env;	1646	op = op->env;
1861	}	1647	}
1862	}	1648	}
1863		1649
		1650	object *
		1651	insert_ob_in_ob (object *op, object *where)
		1652	{
		1653	if (!where)
		1654	{
		1655	char *dump = dump_object (op);
		1656	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1657	free (dump);
		1658	return op;
		1659	}
		1660
		1661	if (where->head)
		1662	{
		1663	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1664	where = where->head;
		1665	}
		1666
		1667	return where->insert (op);
		1668	}
		1669
1864	/*	1670	/*
1865	* insert_ob_in_ob(op,environment):	1671	* env->insert (op)
1866	* This function inserts the object op in the linked list	1672	* This function inserts the object op in the linked list
1867	* inside the object environment.	1673	* inside the object environment.
1868	*	1674	*
1869	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1870	* the inventory at the last position or next to other objects of the same
1871	* type.
1872	* Frank: Now sorted by type, archetype and magic!
1873	*
1874	* The function returns now pointer to inserted item, and return value can	1675	* The function returns now pointer to inserted item, and return value can
1875	* be != op, if items are merged. -Tero	1676	* be != op, if items are merged. -Tero
1876	*/	1677	*/
1877		1678
1878	object *	1679	object *
1879	insert_ob_in_ob (object *op, object *where)	1680	object::insert (object *op)
1880	{	1681	{
1881	object *	1682	object *tmp, *otmp;
1882	tmp, *
1883	otmp;
1884		1683
1885	if (!QUERY_FLAG (op, FLAG_REMOVED))	1684	if (!QUERY_FLAG (op, FLAG_REMOVED))
1886	{	1685	op->remove ();
1887	dump_object (op);	1686
1888	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1889	return op;
1890	}
1891	if (where == NULL)
1892	{
1893	dump_object (op);
1894	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1895	return op;
1896	}
1897	if (where->head)
1898	{
1899	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1900	where = where->head;
1901	}
1902	if (op->more)	1687	if (op->more)
1903	{	1688	{
1904	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1689	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1905	return op;	1690	return op;
1906	}	1691	}
		1692
1907	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1693	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1908	CLEAR_FLAG (op, FLAG_REMOVED);	1694	CLEAR_FLAG (op, FLAG_REMOVED);
1909	if (op->nrof)	1695	if (op->nrof)
1910	{	1696	{
1911	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1697	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1912	if (CAN_MERGE (tmp, op))	1698	if (object::can_merge (tmp, op))
1913	{	1699	{
1914	/* return the original object and remove inserted object	1700	/* return the original object and remove inserted object
1915	(client needs the original object) */	1701	(client needs the original object) */
1916	tmp->nrof += op->nrof;	1702	tmp->nrof += op->nrof;
1917	/* Weight handling gets pretty funky. Since we are adding to	1703	/* Weight handling gets pretty funky. Since we are adding to
1918	* tmp->nrof, we need to increase the weight.	1704	* tmp->nrof, we need to increase the weight.
1919	*/	1705	*/
1920	add_weight (where, op->weight * op->nrof);	1706	add_weight (this, op->weight * op->nrof);
1921	SET_FLAG (op, FLAG_REMOVED);	1707	SET_FLAG (op, FLAG_REMOVED);
1922	free_object (op); /* free the inserted object */	1708	op->destroy (); /* free the inserted object */
1923	op = tmp;	1709	op = tmp;
1924	remove_ob (op); /* and fix old object's links */	1710	op->remove (); /* and fix old object's links */
1925	CLEAR_FLAG (op, FLAG_REMOVED);	1711	CLEAR_FLAG (op, FLAG_REMOVED);
1926	break;	1712	break;
1927	}	1713	}
1928		1714
1929	/* I assume combined objects have no inventory	1715	/* I assume combined objects have no inventory
1930	* We add the weight - this object could have just been removed	1716	* We add the weight - this object could have just been removed
1931	* (if it was possible to merge). calling remove_ob will subtract	1717	* (if it was possible to merge). calling remove_ob will subtract
1932	* the weight, so we need to add it in again, since we actually do	1718	* the weight, so we need to add it in again, since we actually do
1933	* the linking below	1719	* the linking below
1934	*/	1720	*/
1935	add_weight (where, op->weight * op->nrof);	1721	add_weight (this, op->weight * op->nrof);
1936	}	1722	}
1937	else	1723	else
1938	add_weight (where, (op->weight + op->carrying));	1724	add_weight (this, (op->weight + op->carrying));
1939		1725
1940	otmp = is_player_inv (where);	1726	otmp = this->in_player ();
1941	if (otmp && otmp->contr != NULL)	1727	if (otmp && otmp->contr)
1942	{
1943	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1728	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1944	fix_player (otmp);	1729	fix_player (otmp);
1945	}
1946		1730
1947	op->map = NULL;	1731	op->map = 0;
1948	op->env = where;	1732	op->env = this;
1949	op->above = NULL;	1733	op->above = 0;
1950	op->below = NULL;	1734	op->below = 0;
1951	op->x = 0, op->y = 0;	1735	op->x = 0, op->y = 0;
1952		1736
1953	/* reset the light list and los of the players on the map */	1737	/* reset the light list and los of the players on the map */
1954	if ((op->glow_radius != 0) && where->map)	1738	if ((op->glow_radius != 0) && map)
1955	{	1739	{
1956	#ifdef DEBUG_LIGHTS	1740	#ifdef DEBUG_LIGHTS
1957	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1741	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1958	#endif /* DEBUG_LIGHTS */	1742	#endif /* DEBUG_LIGHTS */
1959	if (MAP_DARKNESS (where->map))	1743	if (MAP_DARKNESS (map))
1960	update_all_los (where->map, where->x, where->y);	1744	update_all_los (map, x, y);
1961	}	1745	}
1962		1746
1963	/* Client has no idea of ordering so lets not bother ordering it here.	1747	/* Client has no idea of ordering so lets not bother ordering it here.
1964	* It sure simplifies this function...	1748	* It sure simplifies this function...
1965	*/	1749	*/
1966	if (where->inv == NULL)	1750	if (!inv)
1967	where->inv = op;	1751	inv = op;
1968	else	1752	else
1969	{	1753	{
1970	op->below = where->inv;	1754	op->below = inv;
1971	op->below->above = op;	1755	op->below->above = op;
1972	where->inv = op;	1756	inv = op;
1973	}	1757	}
		1758
1974	return op;	1759	return op;
1975	}	1760	}
1976		1761
1977	/*	1762	/*
1978	* Checks if any objects has a move_type that matches objects	1763	* Checks if any objects has a move_type that matches objects
…		…
1996	*/	1781	*/
1997		1782
1998	int	1783	int
1999	check_move_on (object *op, object *originator)	1784	check_move_on (object *op, object *originator)
2000	{	1785	{
2001	object *	1786	object *tmp;
2002	tmp;	1787	maptile *m = op->map;
2003	tag_t
2004	tag;
2005	mapstruct *
2006	m = op->map;
2007	int
2008	x = op->x, y = op->y;	1788	int x = op->x, y = op->y;
2009	MoveType	1789
2010	move_on,	1790	MoveType move_on, move_slow, move_block;
2011	move_slow,
2012	move_block;
2013		1791
2014	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1792	if (QUERY_FLAG (op, FLAG_NO_APPLY))
2015	return 0;	1793	return 0;
2016
2017	tag = op->count;
2018		1794
2019	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1795	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
2020	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1796	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
2021	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1797	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
2022		1798
…		…
2047	* we don't need to check all of them.	1823	* we don't need to check all of them.
2048	*/	1824	*/
2049	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))	1825	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
2050	break;	1826	break;
2051	}	1827	}
		1828
2052	for (; tmp != NULL; tmp = tmp->below)	1829	for (; tmp; tmp = tmp->below)
2053	{	1830	{
2054	if (tmp == op)	1831	if (tmp == op)
2055	continue; /* Can't apply yourself */	1832	continue; /* Can't apply yourself */
2056		1833
2057	/* Check to see if one of the movement types should be slowed down.	1834	/* Check to see if one of the movement types should be slowed down.
…		…
2065	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1842	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2066	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1843	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2067	{	1844	{
2068		1845
2069	float	1846	float
2070	diff;
2071
2072	diff = tmp->move_slow_penalty * FABS (op->speed);	1847	diff = tmp->move_slow_penalty * FABS (op->speed);
		1848
2073	if (op->type == PLAYER)	1849	if (op->type == PLAYER)
2074	{
2075	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1850	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2076	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1851	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2077	{
2078	diff /= 4.0;	1852	diff /= 4.0;
2079	}	1853
2080	}
2081	op->speed_left -= diff;	1854	op->speed_left -= diff;
2082	}	1855	}
2083	}	1856	}
2084		1857
2085	/* Basically same logic as above, except now for actual apply. */	1858	/* Basically same logic as above, except now for actual apply. */
2086	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1859	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2087	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1860	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2088	{	1861	{
2089
2090	move_apply (tmp, op, originator);	1862	move_apply (tmp, op, originator);
		1863
2091	if (was_destroyed (op, tag))	1864	if (op->destroyed ())
2092	return 1;	1865	return 1;
2093		1866
2094	/* what the person/creature stepped onto has moved the object	1867	/* what the person/creature stepped onto has moved the object
2095	* someplace new. Don't process any further - if we did,	1868	* someplace new. Don't process any further - if we did,
2096	* have a feeling strange problems would result.	1869	* have a feeling strange problems would result.
2097	*/	1870	*/
2098	if (op->map != m || op->x != x || op->y != y)	1871	if (op->map != m || op->x != x || op->y != y)
2099	return 0;	1872	return 0;
2100	}	1873	}
2101	}	1874	}
		1875
2102	return 0;	1876	return 0;
2103	}	1877	}
2104		1878
2105	/*	1879	/*
2106	* present_arch(arch, map, x, y) searches for any objects with	1880	* present_arch(arch, map, x, y) searches for any objects with
2107	* a matching archetype at the given map and coordinates.	1881	* a matching archetype at the given map and coordinates.
2108	* The first matching object is returned, or NULL if none.	1882	* The first matching object is returned, or NULL if none.
2109	*/	1883	*/
2110		1884
2111	object *	1885	object *
2112	present_arch (const archetype *at, mapstruct *m, int x, int y)	1886	present_arch (const archetype *at, maptile *m, int x, int y)
2113	{	1887	{
2114	object *	1888	object *
2115	tmp;	1889	tmp;
2116		1890
2117	if (m == NULL || out_of_map (m, x, y))	1891	if (m == NULL || out_of_map (m, x, y))
…		…
2130	* a matching type variable at the given map and coordinates.	1904	* a matching type variable at the given map and coordinates.
2131	* The first matching object is returned, or NULL if none.	1905	* The first matching object is returned, or NULL if none.
2132	*/	1906	*/
2133		1907
2134	object *	1908	object *
2135	present (unsigned char type, mapstruct *m, int x, int y)	1909	present (unsigned char type, maptile *m, int x, int y)
2136	{	1910	{
2137	object *	1911	object *
2138	tmp;	1912	tmp;
2139		1913
2140	if (out_of_map (m, x, y))	1914	if (out_of_map (m, x, y))
…		…
2280	* the archetype because that isn't correct if the monster has been	2054	* the archetype because that isn't correct if the monster has been
2281	* customized, changed states, etc.	2055	* customized, changed states, etc.
2282	*/	2056	*/
2283		2057
2284	int	2058	int
2285	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2059	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2286	{	2060	{
2287	int	2061	int
2288	i,	2062	i,
2289	index = 0, flag;	2063	index = 0, flag;
2290	static int	2064	static int
…		…
2302	* if the space being examined only has a wall to the north and empty	2076	* if the space being examined only has a wall to the north and empty
2303	* spaces in all the other directions, this will reduce the search space	2077	* spaces in all the other directions, this will reduce the search space
2304	* to only the spaces immediately surrounding the target area, and	2078	* to only the spaces immediately surrounding the target area, and
2305	* won't look 2 spaces south of the target space.	2079	* won't look 2 spaces south of the target space.
2306	*/	2080	*/
2307	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2081	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2308	stop = maxfree[i];	2082	stop = maxfree[i];
2309	}	2083	}
		2084
2310	if (!index)	2085	if (!index)
2311	return -1;	2086	return -1;
		2087
2312	return altern[RANDOM () % index];	2088	return altern[RANDOM () % index];
2313	}	2089	}
2314		2090
2315	/*	2091	/*
2316	* find_first_free_spot(archetype, mapstruct, x, y) works like	2092	* find_first_free_spot(archetype, maptile, x, y) works like
2317	* find_free_spot(), but it will search max number of squares.	2093	* find_free_spot(), but it will search max number of squares.
2318	* But it will return the first available spot, not a random choice.	2094	* But it will return the first available spot, not a random choice.
2319	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2095	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2320	*/	2096	*/
2321		2097
2322	int	2098	int
2323	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2099	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2324	{	2100	{
2325	int	2101	int
2326	i;	2102	i;
2327		2103
2328	for (i = 0; i < SIZEOFFREE; i++)	2104	for (i = 0; i < SIZEOFFREE; i++)
…		…
2392	* because we have to know what movement the thing looking to move	2168	* because we have to know what movement the thing looking to move
2393	* there is capable of.	2169	* there is capable of.
2394	*/	2170	*/
2395		2171
2396	int	2172	int
2397	find_dir (mapstruct *m, int x, int y, object *exclude)	2173	find_dir (maptile *m, int x, int y, object *exclude)
2398	{	2174	{
2399	int	2175	int
2400	i,	2176	i,
2401	max = SIZEOFFREE, mflags;	2177	max = SIZEOFFREE, mflags;
2402	sint16	2178
2403	nx,	2179	sint16 nx, ny;
2404	ny;
2405	object *	2180	object *
2406	tmp;	2181	tmp;
2407	mapstruct *	2182	maptile *
2408	mp;	2183	mp;
2409	MoveType	2184
2410	blocked,	2185	MoveType blocked, move_type;
2411	move_type;
2412		2186
2413	if (exclude && exclude->head)	2187	if (exclude && exclude->head)
2414	{	2188	{
2415	exclude = exclude->head;	2189	exclude = exclude->head;
2416	move_type = exclude->move_type;	2190	move_type = exclude->move_type;
…		…
2426	mp = m;	2200	mp = m;
2427	nx = x + freearr_x[i];	2201	nx = x + freearr_x[i];
2428	ny = y + freearr_y[i];	2202	ny = y + freearr_y[i];
2429		2203
2430	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2204	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2205
2431	if (mflags & P_OUT_OF_MAP)	2206	if (mflags & P_OUT_OF_MAP)
2432	{
2433	max = maxfree[i];	2207	max = maxfree[i];
2434	}
2435	else	2208	else
2436	{	2209	{
2437	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2210	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);
2438		2211
2439	if ((move_type & blocked) == move_type)	2212	if ((move_type & blocked) == move_type)
2440	{
2441	max = maxfree[i];	2213	max = maxfree[i];
2442	}
2443	else if (mflags & P_IS_ALIVE)	2214	else if (mflags & P_IS_ALIVE)
2444	{	2215	{
2445	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2216	for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)
2446	{
2447	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2217	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2448	{
2449	break;	2218	break;
2450	}	2219
2451	}
2452	if (tmp)	2220	if (tmp)
2453	{
2454	return freedir[i];	2221	return freedir[i];
2455	}
2456	}	2222	}
2457	}	2223	}
2458	}	2224	}
		2225
2459	return 0;	2226	return 0;
2460	}	2227	}
2461		2228
2462	/*	2229	/*
2463	* distance(object 1, object 2) will return the square of the	2230	* distance(object 1, object 2) will return the square of the
…		…
2465	*/	2232	*/
2466		2233
2467	int	2234	int
2468	distance (const object *ob1, const object *ob2)	2235	distance (const object *ob1, const object *ob2)
2469	{	2236	{
2470	int	2237	int i;
2471	i;
2472		2238
2473	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2239	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2474	return i;	2240	return i;
2475	}	2241	}
2476		2242
…		…
2481	*/	2247	*/
2482		2248
2483	int	2249	int
2484	find_dir_2 (int x, int y)	2250	find_dir_2 (int x, int y)
2485	{	2251	{
2486	int	2252	int q;
2487	q;
2488		2253
2489	if (y)	2254	if (y)
2490	q = x * 100 / y;	2255	q = x * 100 / y;
2491	else if (x)	2256	else if (x)
2492	q = -300 * x;	2257	q = -300 * x;
…		…
2618	* find a path to that monster that we found. If not,	2383	* find a path to that monster that we found. If not,
2619	* we don't bother going toward it. Returns 1 if we	2384	* we don't bother going toward it. Returns 1 if we
2620	* can see a direct way to get it	2385	* can see a direct way to get it
2621	* Modified to be map tile aware -.MSW	2386	* Modified to be map tile aware -.MSW
2622	*/	2387	*/
2623
2624
2625	int	2388	int
2626	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2389	can_see_monsterP (maptile *m, int x, int y, int dir)
2627	{	2390	{
2628	sint16	2391	sint16 dx, dy;
2629	dx,
2630	dy;
2631	int
2632	mflags;	2392	int mflags;
2633		2393
2634	if (dir < 0)	2394	if (dir < 0)
2635	return 0; /* exit condition: invalid direction */	2395	return 0; /* exit condition: invalid direction */
2636		2396
2637	dx = x + freearr_x[dir];	2397	dx = x + freearr_x[dir];
…		…
2650	return 0;	2410	return 0;
2651		2411
2652	/* yes, can see. */	2412	/* yes, can see. */
2653	if (dir < 9)	2413	if (dir < 9)
2654	return 1;	2414	return 1;
		2415
2655	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2416	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2656	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2417	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2418	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2657	}	2419	}
2658
2659
2660		2420
2661	/*	2421	/*
2662	* can_pick(picker, item): finds out if an object is possible to be	2422	* can_pick(picker, item): finds out if an object is possible to be
2663	* picked up by the picker. Returnes 1 if it can be	2423	* picked up by the picker. Returnes 1 if it can be
2664	* picked up, otherwise 0.	2424	* picked up, otherwise 0.
…		…
2675	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2435	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2676	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2436	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2677	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2437	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2678	}	2438	}
2679		2439
2680
2681	/*	2440	/*
2682	* create clone from object to another	2441	* create clone from object to another
2683	*/	2442	*/
2684	object *	2443	object *
2685	object_create_clone (object *asrc)	2444	object_create_clone (object *asrc)
2686	{	2445	{
2687	object *
2688	dst = NULL, *tmp, *src, *part, *prev, *item;	2446	object *dst = 0, *tmp, *src, *part, *prev, *item;
2689		2447
2690	if (!asrc)	2448	if (!asrc)
2691	return NULL;	2449	return 0;
		2450
2692	src = asrc;	2451	src = asrc;
2693	if (src->head)	2452	if (src->head)
2694	src = src->head;	2453	src = src->head;
2695		2454
2696	prev = NULL;	2455	prev = 0;
2697	for (part = src; part; part = part->more)	2456	for (part = src; part; part = part->more)
2698	{	2457	{
2699	tmp = get_object ();	2458	tmp = part->clone ();
2700	copy_object (part, tmp);
2701	tmp->x -= src->x;	2459	tmp->x -= src->x;
2702	tmp->y -= src->y;	2460	tmp->y -= src->y;
		2461
2703	if (!part->head)	2462	if (!part->head)
2704	{	2463	{
2705	dst = tmp;	2464	dst = tmp;
2706	tmp->head = NULL;	2465	tmp->head = 0;
2707	}	2466	}
2708	else	2467	else
2709	{
2710	tmp->head = dst;	2468	tmp->head = dst;
2711	}	2469
2712	tmp->more = NULL;	2470	tmp->more = 0;
		2471
2713	if (prev)	2472	if (prev)
2714	prev->more = tmp;	2473	prev->more = tmp;
		2474
2715	prev = tmp;	2475	prev = tmp;
2716	}	2476	}
2717		2477
2718	/*** copy inventory ***/
2719	for (item = src->inv; item; item = item->below)	2478	for (item = src->inv; item; item = item->below)
2720	{
2721	(void) insert_ob_in_ob (object_create_clone (item), dst);	2479	insert_ob_in_ob (object_create_clone (item), dst);
2722	}
2723		2480
2724	return dst;	2481	return dst;
2725	}	2482	}
2726		2483
2727	/* return true if the object was destroyed, 0 otherwise */
2728	int
2729	was_destroyed (const object *op, tag_t old_tag)
2730	{
2731	/* checking for FLAG_FREED isn't necessary, but makes this function more
2732	* robust */
2733	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2734	}
2735
2736	/* GROS - Creates an object using a string representing its content. */	2484	/* GROS - Creates an object using a string representing its content. */
2737
2738	/* Basically, we save the content of the string to a temp file, then call */	2485	/* Basically, we save the content of the string to a temp file, then call */
2739
2740	/* load_object on it. I admit it is a highly inefficient way to make things, */	2486	/* load_object on it. I admit it is a highly inefficient way to make things, */
2741
2742	/* but it was simple to make and allows reusing the load_object function. */	2487	/* but it was simple to make and allows reusing the load_object function. */
2743
2744	/* Remember not to use load_object_str in a time-critical situation. */	2488	/* Remember not to use load_object_str in a time-critical situation. */
2745
2746	/* Also remember that multiparts objects are not supported for now. */	2489	/* Also remember that multiparts objects are not supported for now. */
2747		2490
2748	object *	2491	object *
2749	load_object_str (const char *obstr)	2492	load_object_str (const char *obstr)
2750	{	2493	{
2751	object *	2494	object *op;
2752	op;
2753	char
2754	filename[MAX_BUF];	2495	char filename[MAX_BUF];
2755		2496
2756	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2497	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2757		2498
2758	FILE *
2759	tempfile = fopen (filename, "w");	2499	FILE *tempfile = fopen (filename, "w");
2760		2500
2761	if (tempfile == NULL)	2501	if (tempfile == NULL)
2762	{	2502	{
2763	LOG (llevError, "Error - Unable to access load object temp file\n");	2503	LOG (llevError, "Error - Unable to access load object temp file\n");
2764	return NULL;	2504	return NULL;
2765	};	2505	}
		2506
2766	fprintf (tempfile, obstr);	2507	fprintf (tempfile, obstr);
2767	fclose (tempfile);	2508	fclose (tempfile);
2768		2509
2769	op = get_object ();	2510	op = object::create ();
2770		2511
2771	object_thawer	2512	object_thawer thawer (filename);
2772	thawer (filename);
2773		2513
2774	if (thawer)	2514	if (thawer)
2775	load_object (thawer, op, 0);	2515	load_object (thawer, op, 0);
2776		2516
2777	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2517	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2785	* returns NULL if no match.	2525	* returns NULL if no match.
2786	*/	2526	*/
2787	object *	2527	object *
2788	find_obj_by_type_subtype (const object *who, int type, int subtype)	2528	find_obj_by_type_subtype (const object *who, int type, int subtype)
2789	{	2529	{
2790	object *	2530	object *tmp;
2791	tmp;
2792		2531
2793	for (tmp = who->inv; tmp; tmp = tmp->below)	2532	for (tmp = who->inv; tmp; tmp = tmp->below)
2794	if (tmp->type == type && tmp->subtype == subtype)	2533	if (tmp->type == type && tmp->subtype == subtype)
2795	return tmp;	2534	return tmp;
2796		2535
…		…
2804	* do the desired thing.	2543	* do the desired thing.
2805	*/	2544	*/
2806	key_value *	2545	key_value *
2807	get_ob_key_link (const object *ob, const char *key)	2546	get_ob_key_link (const object *ob, const char *key)
2808	{	2547	{
2809	key_value *	2548	key_value *link;
2810	link;
2811		2549
2812	for (link = ob->key_values; link != NULL; link = link->next)	2550	for (link = ob->key_values; link != NULL; link = link->next)
2813	{
2814	if (link->key == key)	2551	if (link->key == key)
2815	{
2816	return link;	2552	return link;
2817	}
2818	}
2819		2553
2820	return NULL;	2554	return NULL;
2821	}	2555	}
2822		2556
2823	/*	2557	/*
…		…
2828	* The returned string is shared.	2562	* The returned string is shared.
2829	*/	2563	*/
2830	const char *	2564	const char *
2831	get_ob_key_value (const object *op, const char *const key)	2565	get_ob_key_value (const object *op, const char *const key)
2832	{	2566	{
2833	key_value *	2567	key_value *link;
2834	link;	2568	shstr_cmp canonical_key (key);
2835	const char *
2836	canonical_key;
2837		2569
2838	canonical_key = shstr::find (key);
2839
2840	if (canonical_key == NULL)	2570	if (!canonical_key)
2841	{	2571	{
2842	/* 1. There being a field named key on any object	2572	/* 1. There being a field named key on any object
2843	* implies there'd be a shared string to find.	2573	* implies there'd be a shared string to find.
2844	* 2. Since there isn't, no object has this field.	2574	* 2. Since there isn't, no object has this field.
2845	* 3. Therefore, *this* object doesn't have this field.	2575	* 3. Therefore, *this* object doesn't have this field.
2846	*/	2576	*/
2847	return NULL;	2577	return 0;
2848	}	2578	}
2849		2579
2850	/* This is copied from get_ob_key_link() above -	2580	/* This is copied from get_ob_key_link() above -
2851	* only 4 lines, and saves the function call overhead.	2581	* only 4 lines, and saves the function call overhead.
2852	*/	2582	*/
2853	for (link = op->key_values; link != NULL; link = link->next)	2583	for (link = op->key_values; link; link = link->next)
2854	{
2855	if (link->key == canonical_key)	2584	if (link->key == canonical_key)
2856	{
2857	return link->value;	2585	return link->value;
2858	}	2586
2859	}
2860	return NULL;	2587	return 0;
2861	}	2588	}
2862		2589
2863		2590
2864	/*	2591	/*
2865	* Updates the canonical_key in op to value.	2592	* Updates the canonical_key in op to value.
…		…
2901	if (last)	2628	if (last)
2902	last->next = field->next;	2629	last->next = field->next;
2903	else	2630	else
2904	op->key_values = field->next;	2631	op->key_values = field->next;
2905		2632
2906	delete
2907	field;	2633	delete field;
2908	}	2634	}
2909	}	2635	}
2910	return TRUE;	2636	return TRUE;
2911	}	2637	}
2912	/* IF we get here, key doesn't exist */	2638	/* IF we get here, key doesn't exist */
…		…
2947	* Returns TRUE on success.	2673	* Returns TRUE on success.
2948	*/	2674	*/
2949	int	2675	int
2950	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2676	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2951	{	2677	{
2952	shstr
2953	key_ (key);	2678	shstr key_ (key);
2954		2679
2955	return set_ob_key_value_s (op, key_, value, add_key);	2680	return set_ob_key_value_s (op, key_, value, add_key);
2956	}	2681	}
		2682
		2683	object::depth_iterator::depth_iterator (object *container)
		2684	: iterator_base (container)
		2685	{
		2686	while (item->inv)
		2687	item = item->inv;
		2688	}
		2689
		2690	void
		2691	object::depth_iterator::next ()
		2692	{
		2693	if (item->below)
		2694	{
		2695	item = item->below;
		2696
		2697	while (item->inv)
		2698	item = item->inv;
		2699	}
		2700	else
		2701	item = item->env;
		2702	}
		2703
		2704	// return a suitable string describing an objetc in enough detail to find it
		2705	const char *
		2706	object::debug_desc (char *info) const
		2707	{
		2708	char info2[256 * 3];
		2709	char *p = info;
		2710
		2711	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2712	count,
		2713	&name,
		2714	title ? " " : "",
		2715	title ? (const char *)title : "");
		2716
		2717	if (env)
		2718	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2719
		2720	if (map)
		2721	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2722
		2723	return info;
		2724	}
		2725
		2726	const char *
		2727	object::debug_desc () const
		2728	{
		2729	static char info[256 * 3];
		2730	return debug_desc (info);
		2731	}
		2732

Diff Legend

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