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.29 by root, Mon Sep 11 12:38:36 2006 UTC vs.
Revision 1.74 by root, Wed Dec 20 09:14:21 2006 UTC

1
2	/*	1	/*
3	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
4		3
5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
…		…
17		16
18	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
19	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21		20
22	The authors can be reached via e-mail at crossfire-devel@real-time.com	21	The authors can be reached via e-mail at <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
27	variable. */	26	variable. */
…		…
29	#include <stdio.h>	28	#include <stdio.h>
30	#include <sys/types.h>	29	#include <sys/types.h>
31	#include <sys/uio.h>	30	#include <sys/uio.h>
32	#include <object.h>	31	#include <object.h>
33	#include <funcpoint.h>	32	#include <funcpoint.h>
34	#include <skills.h>
35	#include <loader.h>	33	#include <loader.h>
36		34
		35	#include <bitset>
		36
37	int nrofallocobjects = 0;	37	int nrofallocobjects = 0;
		38	static UUID uuid;
		39	const uint64 UUID_SKIP = 1<<19;
38		40
39	object *objects; /* Pointer to the list of used objects */
40	object *active_objects; /* List of active objects that need to be processed */	41	object *active_objects; /* List of active objects that need to be processed */
41		42
42	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	43	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
43	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
44	};	45	};
…		…
51	int freedir[SIZEOFFREE] = {	52	int freedir[SIZEOFFREE] = {
52	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	53	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
53	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	54	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
54	};	55	};
55		56
		57	static void
		58	write_uuid (void)
		59	{
		60	char filename1[MAX_BUF], filename2[MAX_BUF];
		61
		62	sprintf (filename1, "%s/uuid", settings.localdir);
		63	sprintf (filename2, "%s/uuid~", settings.localdir);
		64
		65	FILE *fp;
		66
		67	if (!(fp = fopen (filename2, "w")))
		68	{
		69	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
		70	return;
		71	}
		72
		73	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
		74	fclose (fp);
		75	rename (filename2, filename1);
		76	}
		77
		78	static void
		79	read_uuid (void)
		80	{
		81	char filename[MAX_BUF];
		82
		83	sprintf (filename, "%s/uuid", settings.localdir);
		84
		85	FILE *fp;
		86
		87	if (!(fp = fopen (filename, "r")))
		88	{
		89	if (errno == ENOENT)
		90	{
		91	LOG (llevInfo, "RESET uid to 1\n");
		92	uuid.seq = 0;
		93	write_uuid ();
		94	return;
		95	}
		96
		97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
		98	_exit (1);
		99	}
		100
		101	int version;
		102	unsigned long long uid;
		103	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
		104	{
		105	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
		106	_exit (1);
		107	}
		108
		109	uuid.seq = uid;
		110	write_uuid ();
		111	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
		112	fclose (fp);
		113	}
		114
		115	UUID
		116	gen_uuid ()
		117	{
		118	UUID uid;
		119
		120	uid.seq = ++uuid.seq;
		121
		122	if (!(uuid.seq & (UUID_SKIP - 1)))
		123	write_uuid ();
		124
		125	return uid;
		126	}
		127
		128	void
		129	init_uuid ()
		130	{
		131	read_uuid ();
		132	}
		133
56	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	134	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
57	static int	135	static int
58	compare_ob_value_lists_one (const object *wants, const object *has)	136	compare_ob_value_lists_one (const object *wants, const object *has)
59	{	137	{
60	key_value *wants_field;	138	key_value *wants_field;
…		…
107	*	185	*
108	* Note that this function appears a lot longer than the macro it	186	* Note that this function appears a lot longer than the macro it
109	* replaces - this is mostly for clarity - a decent compiler should hopefully	187	* replaces - this is mostly for clarity - a decent compiler should hopefully
110	* reduce this to the same efficiency.	188	* reduce this to the same efficiency.
111	*	189	*
112	* Check nrof variable *before* calling CAN_MERGE()	190	* Check nrof variable *before* calling can_merge()
113	*	191	*
114	* Improvements made with merge: Better checking on potion, and also	192	* Improvements made with merge: Better checking on potion, and also
115	* check weight	193	* check weight
116	*/	194	*/
117		195
118	bool object::can_merge (object *ob1, object *ob2)	196	bool object::can_merge_slow (object *ob1, object *ob2)
119	{	197	{
120	/* A couple quicksanity checks */	198	/* A couple quicksanity checks */
121	if ((ob1 == ob2) || (ob1->type != ob2->type))	199	if (ob1 == ob2
		200	|| ob1->type != ob2->type
		201	|| ob1->speed != ob2->speed
		202	|| ob1->value != ob2->value
		203	|| ob1->name != ob2->name)
122	return 0;	204	return 0;
123		205
124	if (ob1->speed != ob2->speed)	206	//TODO: this ain't working well, use nicer and correct overflow check
125	return 0;
126
127	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	207	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
128	* value could not be stored in a sint32 (which unfortunately sometimes is	208	* value could not be stored in a sint32 (which unfortunately sometimes is
129	* used to store nrof).	209	* used to store nrof).
130	*/	210	*/
131	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
141	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
142		222
143	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
144	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
145		225
146		226	if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
147	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	227	|| ob1->arch != ob2->arch
148	* being locked in inventory should prevent merging.
149	* 0x4 in flags3 is CLIENT_SENT
150	*/
151	if ((ob1->arch != ob2->arch) ||
152	(ob1->flags[0] != ob2->flags[0]) ||
153	(ob1->flags[1] != ob2->flags[1]) ||
154	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
155	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
156	(ob1->name != ob2->name) ||	228	|| ob1->name != ob2->name
157	(ob1->title != ob2->title) ||	229	|| ob1->title != ob2->title
158	(ob1->msg != ob2->msg) ||	230	|| ob1->msg != ob2->msg
159	(ob1->weight != ob2->weight) ||	231	|| ob1->weight != ob2->weight
160	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	232	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
161	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	233	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
162	(ob1->attacktype != ob2->attacktype) ||	234	|| ob1->attacktype != ob2->attacktype
163	(ob1->magic != ob2->magic) ||	235	|| ob1->magic != ob2->magic
164	(ob1->slaying != ob2->slaying) ||	236	|| ob1->slaying != ob2->slaying
165	(ob1->skill != ob2->skill) ||	237	|| ob1->skill != ob2->skill
166	(ob1->value != ob2->value) ||	238	|| ob1->value != ob2->value
167	(ob1->animation_id != ob2->animation_id) ||	239	|| ob1->animation_id != ob2->animation_id
168	(ob1->client_type != ob2->client_type) ||	240	|| ob1->client_type != ob2->client_type
169	(ob1->materialname != ob2->materialname) ||	241	|| ob1->materialname != ob2->materialname
170	(ob1->lore != ob2->lore) ||	242	|| ob1->lore != ob2->lore
171	(ob1->subtype != ob2->subtype) ||	243	|| ob1->subtype != ob2->subtype
172	(ob1->move_type != ob2->move_type) ||	244	|| ob1->move_type != ob2->move_type
173	(ob1->move_block != ob2->move_block) ||	245	|| ob1->move_block != ob2->move_block
174	(ob1->move_allow != ob2->move_allow) ||	246	|| ob1->move_allow != ob2->move_allow
175	(ob1->move_on != ob2->move_on) ||	247	|| ob1->move_on != ob2->move_on
176	(ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty))	248	|| ob1->move_off != ob2->move_off
		249	|| ob1->move_slow != ob2->move_slow
		250	|| ob1->move_slow_penalty != ob2->move_slow_penalty)
177	return 0;	251	return 0;
178		252
179	/* This is really a spellbook check - really, we should	253	/* This is really a spellbook check - really, we should
180	* check all objects in the inventory.	254	* check all objects in the inventory.
181	*/	255	*/
…		…
184	/* if one object has inventory but the other doesn't, not equiv */	258	/* if one object has inventory but the other doesn't, not equiv */
185	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	259	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
186	return 0;	260	return 0;
187		261
188	/* Now check to see if the two inventory objects could merge */	262	/* Now check to see if the two inventory objects could merge */
189	if (!CAN_MERGE (ob1->inv, ob2->inv))	263	if (!object::can_merge (ob1->inv, ob2->inv))
190	return 0;	264	return 0;
191		265
192	/* inventory ok - still need to check rest of this object to see	266	/* inventory ok - still need to check rest of this object to see
193	* if it is valid.	267	* if it is valid.
194	*/	268	*/
…		…
255	{	329	{
256	if (inv->inv)	330	if (inv->inv)
257	sum_weight (inv);	331	sum_weight (inv);
258	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	332	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
259	}	333	}
		334
260	if (op->type == CONTAINER && op->stats.Str)	335	if (op->type == CONTAINER && op->stats.Str)
261	sum = (sum * (100 - op->stats.Str)) / 100;	336	sum = (sum * (100 - op->stats.Str)) / 100;
		337
262	if (op->carrying != sum)	338	if (op->carrying != sum)
263	op->carrying = sum;	339	op->carrying = sum;
		340
264	return sum;	341	return sum;
265	}	342	}
266		343
267	/**	344	/**
268	* Return the outermost environment object for a given object.	345	* Return the outermost environment object for a given object.
…		…
275	op = op->env;	352	op = op->env;
276	return op;	353	return op;
277	}	354	}
278		355
279	/*	356	/*
280	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
281	* a better check. We basically keeping traversing up until we can't
282	* or find a player.
283	*/
284
285	object *
286	is_player_inv (object *op)
287	{
288	for (; op != NULL && op->type != PLAYER; op = op->env)
289	if (op->env == op)
290	op->env = NULL;
291	return op;
292	}
293
294	/*
295	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
296	* Some error messages.	358	* Some error messages.
297	* The result of the dump is stored in the static global errmsg array.	359	* The result of the dump is stored in the static global errmsg array.
298	*/	360	*/
299		361
300	void	362	char *
301	dump_object2 (object *op)
302	{
303	errmsg[0] = 0;
304	return;
305	//TODO//D#d#
306	#if 0
307	char *cp;
308
309	/* object *tmp;*/
310
311	if (op->arch != NULL)
312	{
313	strcat (errmsg, "arch ");
314	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
315	strcat (errmsg, "\n");
316	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
317	strcat (errmsg, cp);
318	# if 0
319	/* Don't dump player diffs - they are too long, mostly meaningless, and
320	* will overflow the buffer.
321	* Changed so that we don't dump inventory either. This may
322	* also overflow the buffer.
323	*/
324	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
325	strcat (errmsg, cp);
326	for (tmp = op->inv; tmp; tmp = tmp->below)
327	dump_object2 (tmp);
328	# endif
329	strcat (errmsg, "end\n");
330	}
331	else
332	{
333	strcat (errmsg, "Object ");
334	if (op->name == NULL)
335	strcat (errmsg, "(null)");
336	else
337	strcat (errmsg, op->name);
338	strcat (errmsg, "\n");
339	# if 0
340	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
341	strcat (errmsg, cp);
342	for (tmp = op->inv; tmp; tmp = tmp->below)
343	dump_object2 (tmp);
344	# endif
345	strcat (errmsg, "end\n");
346	}
347	#endif
348	}
349
350	/*
351	* Dumps an object. Returns output in the static global errmsg array.
352	*/
353
354	void
355	dump_object (object *op)	363	dump_object (object *op)
356	{	364	{
357	if (op == NULL)	365	if (!op)
358	{	366	return strdup ("[NULLOBJ]");
359	strcpy (errmsg, "[NULL pointer]");
360	return;
361	}
362	errmsg[0] = '\0';
363	dump_object2 (op);
364	}
365		367
366	void	368	object_freezer freezer;
367	dump_all_objects (void)	369	save_object (freezer, op, 3);
368	{	370	return freezer.as_string ();
369	object *op;
370
371	for (op = objects; op != NULL; op = op->next)
372	{
373	dump_object (op);
374	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
375	}
376	}	371	}
377		372
378	/*	373	/*
379	* get_nearest_part(multi-object, object 2) returns the part of the	374	* get_nearest_part(multi-object, object 2) returns the part of the
380	* multi-object 1 which is closest to the second object.	375	* multi-object 1 which is closest to the second object.
…		…
400	*/	395	*/
401		396
402	object *	397	object *
403	find_object (tag_t i)	398	find_object (tag_t i)
404	{	399	{
405	object *op;	400	for (object *op = object::first; op; op = op->next)
406
407	for (op = objects; op != NULL; op = op->next)
408	if (op->count == i)	401	if (op->count == i)
409	break;	402	return op;
		403
410	return op;	404	return 0;
411	}	405	}
412		406
413	/*	407	/*
414	* Returns the first object which has a name equal to the argument.	408	* Returns the first object which has a name equal to the argument.
415	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
…		…
417	*/	411	*/
418		412
419	object *	413	object *
420	find_object_name (const char *str)	414	find_object_name (const char *str)
421	{	415	{
422	const char *name = shstr::find (str);	416	shstr_cmp str_ (str);
423	object *op;	417	object *op;
424		418
425	for (op = objects; op != NULL; op = op->next)	419	for (op = object::first; op != NULL; op = op->next)
426	if (&op->name == name)	420	if (op->name == str_)
427	break;	421	break;
428		422
429	return op;	423	return op;
430	}	424	}
431		425
…		…
434	{	428	{
435	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	429	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
436	}	430	}
437		431
438	/*	432	/*
439	* Returns the object which this object marks as being the owner.
440	* A id-scheme is used to avoid pointing to objects which have been
441	* freed and are now reused. If this is detected, the owner is
442	* set to NULL, and NULL is returned.
443	* Changed 2004-02-12 - if the player is setting at the play again
444	* prompt, he is removed, and we don't want to treat him as an owner of
445	* anything, so check removed flag. I don't expect that this should break
446	* anything - once an object is removed, it is basically dead anyways.
447	*/
448
449	object *
450	get_owner (object *op)
451	{
452	if (op->owner == NULL)
453	return NULL;
454
455	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
456	return op->owner;
457
458	op->owner = NULL;
459	op->ownercount = 0;
460	return NULL;
461	}
462
463	void
464	clear_owner (object *op)
465	{
466	if (!op)
467	return;
468
469	if (op->owner && op->ownercount == op->owner->count)
470	op->owner->refcount--;
471
472	op->owner = NULL;
473	op->ownercount = 0;
474	}
475
476	/*
477	* 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
478	* skill and experience objects.	434	* skill and experience objects.
479	*/	435	*/
480	void	436	void
481	set_owner (object *op, object *owner)	437	object::set_owner (object *owner)
482	{	438	{
483	if (owner == NULL || op == NULL)	439	if (!owner)
484	return;	440	return;
485		441
486	/* next line added to allow objects which own objects */	442	/* next line added to allow objects which own objects */
487	/* 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
488	* with the fireball owning a poison cloud which then owned the	444	* with the fireball owning a poison cloud which then owned the
489	* 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
490	* freed and then another object replacing it. Since the ownercounts	446	* freed and then another object replacing it. Since the ownercounts
491	* 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.
492	*/	448	*/
493	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	449	while (owner->owner)
494	owner = owner->owner;	450	owner = owner->owner;
495		451
496	/* IF the owner still has an owner, we did not resolve to a final owner.
497	* so lets not add to that.
498	*/
499	if (owner->owner)
500	return;
501
502	op->owner = owner;	452	this->owner = owner;
503
504	op->ownercount = owner->count;
505	owner->refcount++;
506	}
507
508	/* Set the owner to clone's current owner and set the skill and experience
509	* objects to clone's objects (typically those objects that where the owner's
510	* current skill and experience objects at the time when clone's owner was
511	* set - not the owner's current skill and experience objects).
512	*
513	* Use this function if player created an object (e.g. fire bullet, swarm
514	* spell), and this object creates further objects whose kills should be
515	* accounted for the player's original skill, even if player has changed
516	* skills meanwhile.
517	*/
518	void
519	copy_owner (object *op, object *clone)
520	{
521	object *owner = get_owner (clone);
522
523	if (owner == NULL)
524	{
525	/* players don't have owners - they own themselves. Update
526	* as appropriate.
527	*/
528	if (clone->type == PLAYER)
529	owner = clone;
530	else
531	return;
532	}
533
534	set_owner (op, owner);
535	}	453	}
536		454
537	/* Zero the key_values on op, decrementing the shared-string	455	/* Zero the key_values on op, decrementing the shared-string
538	* refcounts and freeing the links.	456	* refcounts and freeing the links.
539	*/	457	*/
…		…
555	{	473	{
556	attachable_base::clear ();	474	attachable_base::clear ();
557		475
558	free_key_values (this);	476	free_key_values (this);
559		477
560	clear_owner (this);	478	owner = 0;
561
562	name = 0;	479	name = 0;
563	name_pl = 0;	480	name_pl = 0;
564	title = 0;	481	title = 0;
565	race = 0;	482	race = 0;
566	slaying = 0;	483	slaying = 0;
567	skill = 0;	484	skill = 0;
568	msg = 0;	485	msg = 0;
569	lore = 0;	486	lore = 0;
570	custom_name = 0;	487	custom_name = 0;
571	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;
572		500
573	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	501	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
574		502
575	SET_FLAG (this, FLAG_REMOVED);	503	SET_FLAG (this, FLAG_REMOVED);
576	}
577		504
578	void object::clone (object *destination)
579	{
580	*(object_copy *) destination = *this;
581	*(object_pod *) destination = *this;
582
583	if (self || cb)
584	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
585	}
586
587	/*
588	* clear_object() frees everything allocated by an object, and also
589	* clears all variables and flags to default settings.
590	*/
591
592	void
593	clear_object (object *op)
594	{
595	op->clear ();
596
597	op->contr = NULL;
598	op->below = NULL;
599	op->above = NULL;
600	op->inv = NULL;
601	op->container = NULL;
602	op->env = NULL;
603	op->more = NULL;
604	op->head = NULL;
605	op->map = NULL;
606	op->refcount = 0;
607	op->active_next = NULL;
608	op->active_prev = NULL;
609	/* What is not cleared is next, prev, and count */	505	/* What is not cleared is next, prev, and count */
610		506
611	op->expmul = 1.0;	507	expmul = 1.0;
612	op->face = blank_face;	508	face = blank_face;
613	op->attacked_by_count = -1;
614		509
615	if (settings.casting_time)	510	if (settings.casting_time)
616	op->casting_time = -1;	511	casting_time = -1;
617	}	512	}
618		513
619	/*	514	/*
620	* copy object first frees everything allocated by the second object,	515	* copy_to first frees everything allocated by the dst object,
621	* and then copies the contends of the first object into the second	516	* and then copies the contents of itself into the second
622	* object, allocating what needs to be allocated. Basically, any	517	* object, allocating what needs to be allocated. Basically, any
623	* 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,
624	* 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
625	* will point at garbage.	520	* will point at garbage.
626	*/	521	*/
627
628	void	522	void
629	copy_object (object *op2, object *op)	523	object::copy_to (object *dst)
630	{	524	{
631	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	525	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
632	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	526	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
633		527
634	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));
635		533
636	if (is_freed)	534	if (is_freed)
637	SET_FLAG (op, FLAG_FREED);	535	SET_FLAG (dst, FLAG_FREED);
		536
638	if (is_removed)	537	if (is_removed)
639	SET_FLAG (op, FLAG_REMOVED);	538	SET_FLAG (dst, FLAG_REMOVED);
640		539
641	if (op2->speed < 0)	540	if (speed < 0)
642	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	541	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
643		542
644	/* Copy over key_values, if any. */	543	/* Copy over key_values, if any. */
645	if (op2->key_values)	544	if (key_values)
646	{	545	{
647	key_value *tail = 0;	546	key_value *tail = 0;
648	key_value *i;	547	key_value *i;
649		548
650	op->key_values = 0;	549	dst->key_values = 0;
651		550
652	for (i = op2->key_values; i; i = i->next)	551	for (i = key_values; i; i = i->next)
653	{	552	{
654	key_value *new_link = new key_value;	553	key_value *new_link = new key_value;
655		554
656	new_link->next = 0;	555	new_link->next = 0;
657	new_link->key = i->key;	556	new_link->key = i->key;
658	new_link->value = i->value;	557	new_link->value = i->value;
659		558
660	/* Try and be clever here, too. */	559	/* Try and be clever here, too. */
661	if (!op->key_values)	560	if (!dst->key_values)
662	{	561	{
663	op->key_values = new_link;	562	dst->key_values = new_link;
664	tail = new_link;	563	tail = new_link;
665	}	564	}
666	else	565	else
667	{	566	{
668	tail->next = new_link;	567	tail->next = new_link;
669	tail = new_link;	568	tail = new_link;
670	}	569	}
671	}	570	}
672	}	571	}
673		572
674	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;
675	}	582	}
676		583
677	/*	584	/*
678	* 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
679	* 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
…		…
692	/*	599	/*
693	* 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
694	* 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.
695	* 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.
696	*/	603	*/
697
698	void	604	void
699	update_ob_speed (object *op)	605	update_ob_speed (object *op)
700	{	606	{
701	extern int arch_init;	607	extern int arch_init;
702		608
…		…
711	abort ();	617	abort ();
712	#else	618	#else
713	op->speed = 0;	619	op->speed = 0;
714	#endif	620	#endif
715	}	621	}
		622
716	if (arch_init)	623	if (arch_init)
717	{
718	return;	624	return;
719	}	625
720	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	626	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
721	{	627	{
722	/* If already on active list, don't do anything */	628	/* If already on active list, don't do anything */
723	if (op->active_next || op->active_prev || op == active_objects)	629	if (op->active_next || op->active_prev || op == active_objects)
724	return;	630	return;
725		631
726	/* process_events() expects us to insert the object at the beginning	632	/* process_events() expects us to insert the object at the beginning
727	* of the list. */	633	* of the list. */
728	op->active_next = active_objects;	634	op->active_next = active_objects;
		635
729	if (op->active_next != NULL)	636	if (op->active_next != NULL)
730	op->active_next->active_prev = op;	637	op->active_next->active_prev = op;
		638
731	active_objects = op;	639	active_objects = op;
732	}	640	}
733	else	641	else
734	{	642	{
735	/* If not on the active list, nothing needs to be done */	643	/* If not on the active list, nothing needs to be done */
…		…
737	return;	645	return;
738		646
739	if (op->active_prev == NULL)	647	if (op->active_prev == NULL)
740	{	648	{
741	active_objects = op->active_next;	649	active_objects = op->active_next;
		650
742	if (op->active_next != NULL)	651	if (op->active_next != NULL)
743	op->active_next->active_prev = NULL;	652	op->active_next->active_prev = NULL;
744	}	653	}
745	else	654	else
746	{	655	{
747	op->active_prev->active_next = op->active_next;	656	op->active_prev->active_next = op->active_next;
		657
748	if (op->active_next)	658	if (op->active_next)
749	op->active_next->active_prev = op->active_prev;	659	op->active_next->active_prev = op->active_prev;
750	}	660	}
		661
751	op->active_next = NULL;	662	op->active_next = NULL;
752	op->active_prev = NULL;	663	op->active_prev = NULL;
753	}	664	}
754	}	665	}
755		666
…		…
880	update_now = 1;	791	update_now = 1;
881		792
882	if ((move_slow | op->move_slow) != move_slow)	793	if ((move_slow | op->move_slow) != move_slow)
883	update_now = 1;	794	update_now = 1;
884	}	795	}
		796
885	/* if the object is being removed, we can't make intelligent	797	/* if the object is being removed, we can't make intelligent
886	* decisions, because remove_ob can't really pass the object	798	* decisions, because remove_ob can't really pass the object
887	* that is being removed.	799	* that is being removed.
888	*/	800	*/
889	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	801	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
…		…
901		813
902	if (op->more != NULL)	814	if (op->more != NULL)
903	update_object (op->more, action);	815	update_object (op->more, action);
904	}	816	}
905		817
906	static unordered_vector < object *>mortals;	818	object::vector object::mortals;
907	static	819	object::vector object::objects; // not yet used
908	std::vector < object *>	820	object *object::first;
909	freed;
910		821
911	void object::free_mortals ()	822	void object::free_mortals ()
912	{	823	{
913	for (unordered_vector < object *>::iterator i = mortals.begin (); i != mortals.end ();)	824	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
914	if (!(*i)->refcount)	825	if ((*i)->refcnt)
		826	++i; // further delay freeing
		827	else
915	{	828	{
916	freed.push_back (*i);	829	delete *i;
917	mortals.erase (i);	830	mortals.erase (i);
918	}	831	}
919	else
920	++i;
921	}	832	}
922		833
923	object::object ()	834	object::object ()
924	{	835	{
925	SET_FLAG (this, FLAG_REMOVED);	836	SET_FLAG (this, FLAG_REMOVED);
926		837
927	expmul = 1.0;	838	expmul = 1.0;
928	face = blank_face;	839	face = blank_face;
929	attacked_by_count = -1;
930	}	840	}
931		841
932	object::~object ()	842	object::~object ()
933	{	843	{
934	free_key_values (this);	844	free_key_values (this);
935	}	845	}
936		846
937	void object::link ()	847	void object::link ()
938	{	848	{
939	count = ++ob_count;	849	count = ++ob_count;
		850	uuid = gen_uuid ();
940		851
941	prev = 0;	852	prev = 0;
942	next = objects;	853	next = object::first;
943		854
944	if (objects)	855	if (object::first)
945	objects->prev = this;	856	object::first->prev = this;
946		857
947	objects = this;	858	object::first = this;
948	}	859	}
949		860
950	void object::unlink ()	861	void object::unlink ()
951	{	862	{
952	count = 0;	863	if (this == object::first)
		864	object::first = next;
953		865
954	/* Remove this object from the list of used objects */	866	/* Remove this object from the list of used objects */
955	if (prev)
956	{
957	prev->next = next;	867	if (prev) prev->next = next;
		868	if (next) next->prev = prev;
		869
958	prev = 0;	870	prev = 0;
959	}
960
961	if (next)
962	{
963	next->prev = prev;
964	next = 0;	871	next = 0;
965	}
966
967	if (this == objects)
968	objects = next;
969	}	872	}
970		873
971	object *object::create ()	874	object *object::create ()
972	{	875	{
973	object *
974	op;
975
976	if (freed.empty ())
977	op = new object;	876	object *op = new object;
978
979	else
980	{
981	// highly annoying, but the only way to get it stable right now
982	op = freed.back ();
983	freed.pop_back ();
984	op->~object ();
985	new ((void *) op) object;
986	}
987
988	op->link ();	877	op->link ();
989	return op;	878	return op;
990	}	879	}
991		880
992	/*	881	/*
…		…
994	* it from the list of used objects, and puts it on the list of	883	* it from the list of used objects, and puts it on the list of
995	* free objects. The IS_FREED() flag is set in the object.	884	* free objects. The IS_FREED() flag is set in the object.
996	* The object must have been removed by remove_ob() first for	885	* The object must have been removed by remove_ob() first for
997	* this function to succeed.	886	* this function to succeed.
998	*	887	*
999	* If free_inventory is set, free inventory as well. Else drop items in	888	* If destroy_inventory is set, free inventory as well. Else drop items in
1000	* inventory to the ground.	889	* inventory to the ground.
1001	*/	890	*/
1002	void object::free (bool free_inventory)	891	void object::destroy (bool destroy_inventory)
1003	{	892	{
1004	if (QUERY_FLAG (this, FLAG_FREED))	893	if (QUERY_FLAG (this, FLAG_FREED))
1005	return;	894	return;
1006		895
1007	if (!QUERY_FLAG (this, FLAG_REMOVED))
1008	remove_ob (this);
1009
1010	if (QUERY_FLAG (this, FLAG_FRIENDLY))	896	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1011	remove_friendly_object (this);	897	remove_friendly_object (this);
1012		898
		899	if (!QUERY_FLAG (this, FLAG_REMOVED))
		900	remove ();
		901
1013	SET_FLAG (this, FLAG_FREED);	902	SET_FLAG (this, FLAG_FREED);
1014		903
1015	if (more)	904	if (more)
1016	{	905	{
1017	more->free (free_inventory);	906	more->destroy (destroy_inventory);
1018	more = 0;	907	more = 0;
1019	}	908	}
1020		909
1021	if (inv)	910	if (inv)
1022	{	911	{
1023	/* Only if the space blocks everything do we not process -	912	/* Only if the space blocks everything do we not process -
1024	* if some form of movement is allowed, let objects	913	* if some form of movement is allowed, let objects
1025	* drop on that space.	914	* drop on that space.
1026	*/	915	*/
1027	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	916	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1028	{	917	{
1029	object *op = inv;	918	object *op = inv;
1030		919
1031	while (op)	920	while (op)
1032	{	921	{
1033	object *tmp = op->below;	922	object *tmp = op->below;
1034	op->free (free_inventory);	923	op->destroy (destroy_inventory);
1035	op = tmp;	924	op = tmp;
1036	}	925	}
1037	}	926	}
1038	else	927	else
1039	{ /* Put objects in inventory onto this space */	928	{ /* Put objects in inventory onto this space */
…		…
1041		930
1042	while (op)	931	while (op)
1043	{	932	{
1044	object *tmp = op->below;	933	object *tmp = op->below;
1045		934
1046	remove_ob (op);	935	op->remove ();
1047		936
1048	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	937	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1049	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	938	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1050	free_object (op);	939	op->destroy ();
1051	else	940	else
1052	{	941	{
1053	op->x = x;	942	op->x = x;
1054	op->y = y;	943	op->y = y;
1055	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	944	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
1058	op = tmp;	947	op = tmp;
1059	}	948	}
1060	}	949	}
1061	}	950	}
1062		951
1063	clear_owner (this);	952	// hack to ensure that freed objects still have a valid map
		953	{
		954	static maptile *freed_map; // freed objects are moved here to avoid crashes
		955
		956	if (!freed_map)
		957	{
		958	freed_map = new maptile;
		959
		960	freed_map->name = "/internal/freed_objects_map";
		961	freed_map->width = 3;
		962	freed_map->height = 3;
		963
		964	freed_map->allocate ();
		965	}
		966
		967	map = freed_map;
		968	x = 1;
		969	y = 1;
		970	}
		971
		972	// clear those pointers that likely might have circular references to us
		973	owner = 0;
		974	enemy = 0;
		975	attacked_by = 0;
		976
		977	// only relevant for players(?), but make sure of it anyways
		978	contr = 0;
1064		979
1065	/* Remove object from the active list */	980	/* Remove object from the active list */
1066	speed = 0;	981	speed = 0;
1067	update_ob_speed (this);	982	update_ob_speed (this);
1068		983
…		…
1073		988
1074	/*	989	/*
1075	* sub_weight() recursively (outwards) subtracts a number from the	990	* sub_weight() recursively (outwards) subtracts a number from the
1076	* weight of an object (and what is carried by it's environment(s)).	991	* weight of an object (and what is carried by it's environment(s)).
1077	*/	992	*/
1078
1079	void	993	void
1080	sub_weight (object *op, signed long weight)	994	sub_weight (object *op, signed long weight)
1081	{	995	{
1082	while (op != NULL)	996	while (op != NULL)
1083	{	997	{
1084	if (op->type == CONTAINER)	998	if (op->type == CONTAINER)
1085	{
1086	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	999	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1087	}	1000
1088	op->carrying -= weight;	1001	op->carrying -= weight;
1089	op = op->env;	1002	op = op->env;
1090	}	1003	}
1091	}	1004	}
1092		1005
1093	/* remove_ob(op):	1006	/* op->remove ():
1094	* This function removes the object op from the linked list of objects	1007	* This function removes the object op from the linked list of objects
1095	* which it is currently tied to. When this function is done, the	1008	* which it is currently tied to. When this function is done, the
1096	* object will have no environment. If the object previously had an	1009	* object will have no environment. If the object previously had an
1097	* environment, the x and y coordinates will be updated to	1010	* environment, the x and y coordinates will be updated to
1098	* the previous environment.	1011	* the previous environment.
1099	* Beware: This function is called from the editor as well!	1012	* Beware: This function is called from the editor as well!
1100	*/	1013	*/
1101
1102	void	1014	void
1103	remove_ob (object *op)	1015	object::remove ()
1104	{	1016	{
		1017	object *tmp, *last = 0;
1105	object *	1018	object *otmp;
1106	tmp, *
1107	last = NULL;
1108	object *
1109	otmp;
1110		1019
1111	tag_t
1112	tag;
1113	int
1114	check_walk_off;	1020	int check_walk_off;
1115	mapstruct *
1116	m;
1117		1021
1118	sint16
1119	x,
1120	y;
1121
1122	if (QUERY_FLAG (op, FLAG_REMOVED))	1022	if (QUERY_FLAG (this, FLAG_REMOVED))
1123	return;	1023	return;
1124		1024
1125	SET_FLAG (op, FLAG_REMOVED);	1025	SET_FLAG (this, FLAG_REMOVED);
1126		1026
1127	if (op->more != NULL)	1027	if (more)
1128	remove_ob (op->more);	1028	more->remove ();
1129		1029
1130	/*	1030	/*
1131	* In this case, the object to be removed is in someones	1031	* In this case, the object to be removed is in someones
1132	* inventory.	1032	* inventory.
1133	*/	1033	*/
1134	if (op->env != NULL)	1034	if (env)
1135	{	1035	{
1136	if (op->nrof)	1036	if (nrof)
1137	sub_weight (op->env, op->weight * op->nrof);	1037	sub_weight (env, weight * nrof);
1138	else	1038	else
1139	sub_weight (op->env, op->weight + op->carrying);	1039	sub_weight (env, weight + carrying);
1140		1040
1141	/* NO_FIX_PLAYER is set when a great many changes are being	1041	/* NO_FIX_PLAYER is set when a great many changes are being
1142	* made to players inventory. If set, avoiding the call	1042	* made to players inventory. If set, avoiding the call
1143	* to save cpu time.	1043	* to save cpu time.
1144	*/	1044	*/
1145	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1045	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1146	fix_player (otmp);	1046	fix_player (otmp);
1147		1047
1148	if (op->above != NULL)	1048	if (above != NULL)
1149	op->above->below = op->below;	1049	above->below = below;
1150	else	1050	else
1151	op->env->inv = op->below;	1051	env->inv = below;
1152		1052
1153	if (op->below != NULL)	1053	if (below != NULL)
1154	op->below->above = op->above;	1054	below->above = above;
1155		1055
1156	/* we set up values so that it could be inserted into	1056	/* we set up values so that it could be inserted into
1157	* the map, but we don't actually do that - it is up	1057	* the map, but we don't actually do that - it is up
1158	* to the caller to decide what we want to do.	1058	* to the caller to decide what we want to do.
1159	*/	1059	*/
1160	op->x = op->env->x, op->y = op->env->y;	1060	x = env->x, y = env->y;
1161	op->map = op->env->map;	1061	map = env->map;
1162	op->above = NULL, op->below = NULL;	1062	above = 0, below = 0;
1163	op->env = NULL;	1063	env = 0;
1164	}	1064	}
1165	else if (op->map)	1065	else if (map)
1166	{	1066	{
1167	x = op->x;
1168	y = op->y;
1169	m = get_map_from_coord (op->map, &x, &y);
1170
1171	if (!m)
1172	{
1173	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1174	op->map->path, op->x, op->y);
1175	/* in old days, we used to set x and y to 0 and continue.
1176	* it seems if we get into this case, something is probablye
1177	* screwed up and should be fixed.
1178	*/
1179	abort ();
1180	}
1181
1182	if (op->map != m)
1183	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1184	op->map->path, m->path, op->x, op->y, x, y);
1185
1186	/* Re did the following section of code - it looks like it had	1067	/* Re did the following section of code - it looks like it had
1187	* lots of logic for things we no longer care about	1068	* lots of logic for things we no longer care about
1188	*/	1069	*/
1189		1070
1190	/* link the object above us */	1071	/* link the object above us */
1191	if (op->above)	1072	if (above)
1192	op->above->below = op->below;	1073	above->below = below;
1193	else	1074	else
1194	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1075	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1195		1076
1196	/* Relink the object below us, if there is one */	1077	/* Relink the object below us, if there is one */
1197	if (op->below)	1078	if (below)
1198	op->below->above = op->above;	1079	below->above = above;
1199	else	1080	else
1200	{	1081	{
1201	/* Nothing below, which means we need to relink map object for this space	1082	/* Nothing below, which means we need to relink map object for this space
1202	* use translated coordinates in case some oddness with map tiling is	1083	* use translated coordinates in case some oddness with map tiling is
1203	* evident	1084	* evident
1204	*/	1085	*/
1205	if (GET_MAP_OB (m, x, y) != op)	1086	if (GET_MAP_OB (map, x, y) != this)
1206	{	1087	{
1207	dump_object (op);	1088	char *dump = dump_object (this);
1208	LOG (llevError,	1089	LOG (llevError,
1209	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);	1090	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
		1091	free (dump);
1210	dump_object (GET_MAP_OB (m, x, y));	1092	dump = dump_object (GET_MAP_OB (map, x, y));
1211	LOG (llevError, "%s\n", errmsg);	1093	LOG (llevError, "%s\n", dump);
		1094	free (dump);
1212	}	1095	}
1213		1096
1214	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1097	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1215	}	1098	}
1216		1099
1217	op->above = 0;	1100	above = 0;
1218	op->below = 0;	1101	below = 0;
1219		1102
1220	if (op->map->in_memory == MAP_SAVING)	1103	if (map->in_memory == MAP_SAVING)
1221	return;	1104	return;
1222		1105
1223	tag = op->count;
1224	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1106	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1225		1107
1226	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1108	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1227	{	1109	{
1228	/* No point updating the players look faces if he is the object	1110	/* No point updating the players look faces if he is the object
1229	* being removed.	1111	* being removed.
1230	*/	1112	*/
1231		1113
1232	if (tmp->type == PLAYER && tmp != op)	1114	if (tmp->type == PLAYER && tmp != this)
1233	{	1115	{
1234	/* If a container that the player is currently using somehow gets	1116	/* If a container that the player is currently using somehow gets
1235	* removed (most likely destroyed), update the player view	1117	* removed (most likely destroyed), update the player view
1236	* appropriately.	1118	* appropriately.
1237	*/	1119	*/
1238	if (tmp->container == op)	1120	if (tmp->container == this)
1239	{	1121	{
1240	CLEAR_FLAG (op, FLAG_APPLIED);	1122	CLEAR_FLAG (this, FLAG_APPLIED);
1241	tmp->container = NULL;	1123	tmp->container = 0;
1242	}	1124	}
1243		1125
1244	tmp->contr->socket.update_look = 1;	1126	tmp->contr->socket->floorbox_update ();
1245	}	1127	}
1246		1128
1247	/* See if player moving off should effect something */	1129	/* See if player moving off should effect something */
1248	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1130	if (check_walk_off
		1131	&& ((move_type & tmp->move_off)
		1132	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1249	{	1133	{
1250	move_apply (tmp, op, NULL);	1134	move_apply (tmp, this, 0);
1251		1135
1252	if (was_destroyed (op, tag))	1136	if (destroyed ())
1253	{
1254	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1137	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1255	}
1256	}	1138	}
1257		1139
1258	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1140	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1259		1141
1260	if (tmp->above == tmp)	1142	if (tmp->above == tmp)
1261	tmp->above = NULL;	1143	tmp->above = 0;
1262		1144
1263	last = tmp;	1145	last = tmp;
1264	}	1146	}
1265		1147
1266	/* last == NULL of there are no objects on this space */	1148	/* last == NULL of there are no objects on this space */
1267	if (last == NULL)	1149	if (!last)
1268	{	1150	{
1269	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1151	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1270	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1152	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1271	* those out anyways, and if there are any flags set right now, they won't	1153	* those out anyways, and if there are any flags set right now, they won't
1272	* be correct anyways.	1154	* be correct anyways.
1273	*/	1155	*/
1274	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1156	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1275	update_position (op->map, op->x, op->y);	1157	update_position (map, x, y);
1276	}	1158	}
1277	else	1159	else
1278	update_object (last, UP_OBJ_REMOVE);	1160	update_object (last, UP_OBJ_REMOVE);
1279		1161
1280	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1162	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1281	update_all_los (op->map, op->x, op->y);	1163	update_all_los (map, x, y);
1282	}	1164	}
1283	}	1165	}
1284		1166
1285	/*	1167	/*
1286	* merge_ob(op,top):	1168	* merge_ob(op,top):
…		…
1288	* This function goes through all objects below and including top, and	1170	* This function goes through all objects below and including top, and
1289	* merges op to the first matching object.	1171	* merges op to the first matching object.
1290	* If top is NULL, it is calculated.	1172	* If top is NULL, it is calculated.
1291	* Returns pointer to object if it succeded in the merge, otherwise NULL	1173	* Returns pointer to object if it succeded in the merge, otherwise NULL
1292	*/	1174	*/
1293
1294	object *	1175	object *
1295	merge_ob (object *op, object *top)	1176	merge_ob (object *op, object *top)
1296	{	1177	{
1297	if (!op->nrof)	1178	if (!op->nrof)
1298	return 0;	1179	return 0;
…		…
1302		1183
1303	for (; top != NULL; top = top->below)	1184	for (; top != NULL; top = top->below)
1304	{	1185	{
1305	if (top == op)	1186	if (top == op)
1306	continue;	1187	continue;
1307	if (CAN_MERGE (op, top))	1188
		1189	if (object::can_merge (op, top))
1308	{	1190	{
1309	top->nrof += op->nrof;	1191	top->nrof += op->nrof;
1310		1192
1311	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1193	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1312	op->weight = 0; /* Don't want any adjustements now */	1194	op->weight = 0; /* Don't want any adjustements now */
1313	remove_ob (op);	1195	op->destroy ();
1314	free_object (op);
1315	return top;	1196	return top;
1316	}	1197	}
1317	}	1198	}
1318		1199
1319	return NULL;	1200	return 0;
1320	}	1201	}
1321		1202
1322	/*	1203	/*
1323	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1204	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1324	* job preparing multi-part monsters	1205	* job preparing multi-part monsters
1325	*/	1206	*/
1326	object *	1207	object *
1327	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1208	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1328	{	1209	{
1329	object *tmp;	1210	object *tmp;
1330		1211
1331	if (op->head)	1212	if (op->head)
1332	op = op->head;	1213	op = op->head;
…		…
1360	* NULL if 'op' was destroyed	1241	* NULL if 'op' was destroyed
1361	* just 'op' otherwise	1242	* just 'op' otherwise
1362	*/	1243	*/
1363		1244
1364	object *	1245	object *
1365	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1246	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1366	{	1247	{
1367	object *tmp, *top, *floor = NULL;	1248	object *tmp, *top, *floor = NULL;
1368	sint16 x, y;	1249	sint16 x, y;
1369		1250
1370	if (QUERY_FLAG (op, FLAG_FREED))	1251	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1373	return NULL;	1254	return NULL;
1374	}	1255	}
1375		1256
1376	if (m == NULL)	1257	if (m == NULL)
1377	{	1258	{
1378	dump_object (op);	1259	char *dump = dump_object (op);
1379	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1260	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1261	free (dump);
1380	return op;	1262	return op;
1381	}	1263	}
1382		1264
1383	if (out_of_map (m, op->x, op->y))	1265	if (out_of_map (m, op->x, op->y))
1384	{	1266	{
1385	dump_object (op);	1267	char *dump = dump_object (op);
1386	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1268	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1387	#ifdef MANY_CORES	1269	#ifdef MANY_CORES
1388	/* Better to catch this here, as otherwise the next use of this object	1270	/* Better to catch this here, as otherwise the next use of this object
1389	* is likely to cause a crash. Better to find out where it is getting	1271	* is likely to cause a crash. Better to find out where it is getting
1390	* improperly inserted.	1272	* improperly inserted.
1391	*/	1273	*/
1392	abort ();	1274	abort ();
1393	#endif	1275	#endif
		1276	free (dump);
1394	return op;	1277	return op;
1395	}	1278	}
1396		1279
1397	if (!QUERY_FLAG (op, FLAG_REMOVED))	1280	if (!QUERY_FLAG (op, FLAG_REMOVED))
1398	{	1281	{
1399	dump_object (op);	1282	char *dump = dump_object (op);
1400	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1283	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1284	free (dump);
1401	return op;	1285	return op;
1402	}	1286	}
1403		1287
1404	if (op->more != NULL)	1288	if (op->more != NULL)
1405	{	1289	{
…		…
1443		1327
1444	/* this has to be done after we translate the coordinates.	1328	/* this has to be done after we translate the coordinates.
1445	*/	1329	*/
1446	if (op->nrof && !(flag & INS_NO_MERGE))	1330	if (op->nrof && !(flag & INS_NO_MERGE))
1447	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1331	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1448	if (CAN_MERGE (op, tmp))	1332	if (object::can_merge (op, tmp))
1449	{	1333	{
1450	op->nrof += tmp->nrof;	1334	op->nrof += tmp->nrof;
1451	remove_ob (tmp);	1335	tmp->destroy ();
1452	free_object (tmp);
1453	}	1336	}
1454		1337
1455	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1338	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1456	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1339	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1457		1340
…		…
1585	* it, so save a few ticks and start from there.	1468	* it, so save a few ticks and start from there.
1586	*/	1469	*/
1587	if (!(flag & INS_MAP_LOAD))	1470	if (!(flag & INS_MAP_LOAD))
1588	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1471	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1589	if (tmp->type == PLAYER)	1472	if (tmp->type == PLAYER)
1590	tmp->contr->socket.update_look = 1;	1473	tmp->contr->socket->floorbox_update ();
1591		1474
1592	/* If this object glows, it may affect lighting conditions that are	1475	/* If this object glows, it may affect lighting conditions that are
1593	* visible to others on this map. But update_all_los is really	1476	* visible to others on this map. But update_all_los is really
1594	* an inefficient way to do this, as it means los for all players	1477	* an inefficient way to do this, as it means los for all players
1595	* on the map will get recalculated. The players could very well	1478	* on the map will get recalculated. The players could very well
…		…
1603		1486
1604	/* updates flags (blocked, alive, no magic, etc) for this map space */	1487	/* updates flags (blocked, alive, no magic, etc) for this map space */
1605	update_object (op, UP_OBJ_INSERT);	1488	update_object (op, UP_OBJ_INSERT);
1606		1489
1607	/* Don't know if moving this to the end will break anything. However,	1490	/* Don't know if moving this to the end will break anything. However,
1608	* we want to have update_look set above before calling this.	1491	* we want to have floorbox_update called before calling this.
1609	*	1492	*
1610	* check_move_on() must be after this because code called from	1493	* check_move_on() must be after this because code called from
1611	* check_move_on() depends on correct map flags (so functions like	1494	* check_move_on() depends on correct map flags (so functions like
1612	* blocked() and wall() work properly), and these flags are updated by	1495	* blocked() and wall() work properly), and these flags are updated by
1613	* update_object().	1496	* update_object().
…		…
1643	tmp1;	1526	tmp1;
1644		1527
1645	/* first search for itself and remove any old instances */	1528	/* first search for itself and remove any old instances */
1646		1529
1647	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1530	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1648	{
1649	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1531	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1650	{	1532	tmp->destroy ();
1651	remove_ob (tmp);
1652	free_object (tmp);
1653	}
1654	}
1655		1533
1656	tmp1 = arch_to_object (find_archetype (arch_string));	1534	tmp1 = arch_to_object (archetype::find (arch_string));
1657		1535
1658	tmp1->x = op->x;	1536	tmp1->x = op->x;
1659	tmp1->y = op->y;	1537	tmp1->y = op->y;
1660	insert_ob_in_map (tmp1, op->map, op, 0);	1538	insert_ob_in_map (tmp1, op->map, op, 0);
1661	}	1539	}
…		…
1669	*/	1547	*/
1670		1548
1671	object *	1549	object *
1672	get_split_ob (object *orig_ob, uint32 nr)	1550	get_split_ob (object *orig_ob, uint32 nr)
1673	{	1551	{
1674	object *	1552	object *newob;
1675	newob;
1676	int
1677	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1553	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1678		1554
1679	if (orig_ob->nrof < nr)	1555	if (orig_ob->nrof < nr)
1680	{	1556	{
1681	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1557	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1682	return NULL;	1558	return NULL;
1683	}	1559	}
1684		1560
1685	newob = object_create_clone (orig_ob);	1561	newob = object_create_clone (orig_ob);
1686		1562
1687	if ((orig_ob->nrof -= nr) < 1)	1563	if ((orig_ob->nrof -= nr) < 1)
1688	{	1564	orig_ob->destroy (1);
1689	if (!is_removed)
1690	remove_ob (orig_ob);
1691	free_object2 (orig_ob, 1);
1692	}
1693	else if (!is_removed)	1565	else if (!is_removed)
1694	{	1566	{
1695	if (orig_ob->env != NULL)	1567	if (orig_ob->env != NULL)
1696	sub_weight (orig_ob->env, orig_ob->weight * nr);	1568	sub_weight (orig_ob->env, orig_ob->weight * nr);
1697	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1569	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1727	if (i > op->nrof)	1599	if (i > op->nrof)
1728	i = op->nrof;	1600	i = op->nrof;
1729		1601
1730	if (QUERY_FLAG (op, FLAG_REMOVED))	1602	if (QUERY_FLAG (op, FLAG_REMOVED))
1731	op->nrof -= i;	1603	op->nrof -= i;
1732	else if (op->env != NULL)	1604	else if (op->env)
1733	{	1605	{
1734	/* is this object in the players inventory, or sub container	1606	/* is this object in the players inventory, or sub container
1735	* therein?	1607	* therein?
1736	*/	1608	*/
1737	tmp = is_player_inv (op->env);	1609	tmp = op->in_player ();
1738	/* nope. Is this a container the player has opened?	1610	/* nope. Is this a container the player has opened?
1739	* If so, set tmp to that player.	1611	* If so, set tmp to that player.
1740	* IMO, searching through all the players will mostly	1612	* IMO, searching through all the players will mostly
1741	* likely be quicker than following op->env to the map,	1613	* likely be quicker than following op->env to the map,
1742	* and then searching the map for a player.	1614	* and then searching the map for a player.
1743	*/	1615	*/
1744	if (!tmp)	1616	if (!tmp)
1745	{	1617	{
1746	for (pl = first_player; pl; pl = pl->next)	1618	for (pl = first_player; pl; pl = pl->next)
1747	if (pl->ob->container == op->env)	1619	if (pl->ob->container == op->env)
		1620	{
		1621	tmp = pl->ob;
1748	break;	1622	break;
1749	if (pl)	1623	}
1750	tmp = pl->ob;
1751	else
1752	tmp = NULL;
1753	}	1624	}
1754		1625
1755	if (i < op->nrof)	1626	if (i < op->nrof)
1756	{	1627	{
1757	sub_weight (op->env, op->weight * i);	1628	sub_weight (op->env, op->weight * i);
1758	op->nrof -= i;	1629	op->nrof -= i;
1759	if (tmp)	1630	if (tmp)
1760	{
1761	esrv_send_item (tmp, op);	1631	esrv_send_item (tmp, op);
1762	}
1763	}	1632	}
1764	else	1633	else
1765	{	1634	{
1766	remove_ob (op);	1635	op->remove ();
1767	op->nrof = 0;	1636	op->nrof = 0;
1768	if (tmp)	1637	if (tmp)
1769	{
1770	esrv_del_item (tmp->contr, op->count);	1638	esrv_del_item (tmp->contr, op->count);
1771	}
1772	}	1639	}
1773	}	1640	}
1774	else	1641	else
1775	{	1642	{
1776	object *above = op->above;	1643	object *above = op->above;
1777		1644
1778	if (i < op->nrof)	1645	if (i < op->nrof)
1779	op->nrof -= i;	1646	op->nrof -= i;
1780	else	1647	else
1781	{	1648	{
1782	remove_ob (op);	1649	op->remove ();
1783	op->nrof = 0;	1650	op->nrof = 0;
1784	}	1651	}
1785		1652
1786	/* Since we just removed op, op->above is null */	1653	/* Since we just removed op, op->above is null */
1787	for (tmp = above; tmp != NULL; tmp = tmp->above)	1654	for (tmp = above; tmp; tmp = tmp->above)
1788	if (tmp->type == PLAYER)	1655	if (tmp->type == PLAYER)
1789	{	1656	{
1790	if (op->nrof)	1657	if (op->nrof)
1791	esrv_send_item (tmp, op);	1658	esrv_send_item (tmp, op);
1792	else	1659	else
…		…
1796		1663
1797	if (op->nrof)	1664	if (op->nrof)
1798	return op;	1665	return op;
1799	else	1666	else
1800	{	1667	{
1801	free_object (op);	1668	op->destroy ();
1802	return NULL;	1669	return 0;
1803	}	1670	}
1804	}	1671	}
1805		1672
1806	/*	1673	/*
1807	* add_weight(object, weight) adds the specified weight to an object,	1674	* add_weight(object, weight) adds the specified weight to an object,
…		…
1819	op->carrying += weight;	1686	op->carrying += weight;
1820	op = op->env;	1687	op = op->env;
1821	}	1688	}
1822	}	1689	}
1823		1690
		1691	object *
		1692	insert_ob_in_ob (object *op, object *where)
		1693	{
		1694	if (!where)
		1695	{
		1696	char *dump = dump_object (op);
		1697	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1698	free (dump);
		1699	return op;
		1700	}
		1701
		1702	if (where->head)
		1703	{
		1704	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1705	where = where->head;
		1706	}
		1707
		1708	return where->insert (op);
		1709	}
		1710
1824	/*	1711	/*
1825	* insert_ob_in_ob(op,environment):	1712	* env->insert (op)
1826	* This function inserts the object op in the linked list	1713	* This function inserts the object op in the linked list
1827	* inside the object environment.	1714	* inside the object environment.
1828	*	1715	*
1829	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1830	* the inventory at the last position or next to other objects of the same
1831	* type.
1832	* Frank: Now sorted by type, archetype and magic!
1833	*
1834	* The function returns now pointer to inserted item, and return value can	1716	* The function returns now pointer to inserted item, and return value can
1835	* be != op, if items are merged. -Tero	1717	* be != op, if items are merged. -Tero
1836	*/	1718	*/
1837		1719
1838	object *	1720	object *
1839	insert_ob_in_ob (object *op, object *where)	1721	object::insert (object *op)
1840	{	1722	{
1841	object *	1723	object *tmp, *otmp;
1842	tmp, *
1843	otmp;
1844		1724
1845	if (!QUERY_FLAG (op, FLAG_REMOVED))	1725	if (!QUERY_FLAG (op, FLAG_REMOVED))
1846	{	1726	op->remove ();
1847	dump_object (op);
1848	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1849	return op;
1850	}
1851
1852	if (where == NULL)
1853	{
1854	dump_object (op);
1855	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1856	return op;
1857	}
1858
1859	if (where->head)
1860	{
1861	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1862	where = where->head;
1863	}
1864		1727
1865	if (op->more)	1728	if (op->more)
1866	{	1729	{
1867	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1730	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1868	return op;	1731	return op;
…		…
1870		1733
1871	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1734	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1872	CLEAR_FLAG (op, FLAG_REMOVED);	1735	CLEAR_FLAG (op, FLAG_REMOVED);
1873	if (op->nrof)	1736	if (op->nrof)
1874	{	1737	{
1875	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1738	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1876	if (CAN_MERGE (tmp, op))	1739	if (object::can_merge (tmp, op))
1877	{	1740	{
1878	/* return the original object and remove inserted object	1741	/* return the original object and remove inserted object
1879	(client needs the original object) */	1742	(client needs the original object) */
1880	tmp->nrof += op->nrof;	1743	tmp->nrof += op->nrof;
1881	/* Weight handling gets pretty funky. Since we are adding to	1744	/* Weight handling gets pretty funky. Since we are adding to
1882	* tmp->nrof, we need to increase the weight.	1745	* tmp->nrof, we need to increase the weight.
1883	*/	1746	*/
1884	add_weight (where, op->weight * op->nrof);	1747	add_weight (this, op->weight * op->nrof);
1885	SET_FLAG (op, FLAG_REMOVED);	1748	SET_FLAG (op, FLAG_REMOVED);
1886	free_object (op); /* free the inserted object */	1749	op->destroy (); /* free the inserted object */
1887	op = tmp;	1750	op = tmp;
1888	remove_ob (op); /* and fix old object's links */	1751	op->remove (); /* and fix old object's links */
1889	CLEAR_FLAG (op, FLAG_REMOVED);	1752	CLEAR_FLAG (op, FLAG_REMOVED);
1890	break;	1753	break;
1891	}	1754	}
1892		1755
1893	/* I assume combined objects have no inventory	1756	/* I assume combined objects have no inventory
1894	* We add the weight - this object could have just been removed	1757	* We add the weight - this object could have just been removed
1895	* (if it was possible to merge). calling remove_ob will subtract	1758	* (if it was possible to merge). calling remove_ob will subtract
1896	* the weight, so we need to add it in again, since we actually do	1759	* the weight, so we need to add it in again, since we actually do
1897	* the linking below	1760	* the linking below
1898	*/	1761	*/
1899	add_weight (where, op->weight * op->nrof);	1762	add_weight (this, op->weight * op->nrof);
1900	}	1763	}
1901	else	1764	else
1902	add_weight (where, (op->weight + op->carrying));	1765	add_weight (this, (op->weight + op->carrying));
1903		1766
1904	otmp = is_player_inv (where);	1767	otmp = this->in_player ();
1905	if (otmp && otmp->contr != NULL)	1768	if (otmp && otmp->contr)
1906	{
1907	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1769	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1908	fix_player (otmp);	1770	fix_player (otmp);
1909	}
1910		1771
1911	op->map = NULL;	1772	op->map = 0;
1912	op->env = where;	1773	op->env = this;
1913	op->above = NULL;	1774	op->above = 0;
1914	op->below = NULL;	1775	op->below = 0;
1915	op->x = 0, op->y = 0;	1776	op->x = 0, op->y = 0;
1916		1777
1917	/* reset the light list and los of the players on the map */	1778	/* reset the light list and los of the players on the map */
1918	if ((op->glow_radius != 0) && where->map)	1779	if ((op->glow_radius != 0) && map)
1919	{	1780	{
1920	#ifdef DEBUG_LIGHTS	1781	#ifdef DEBUG_LIGHTS
1921	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1782	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1922	#endif /* DEBUG_LIGHTS */	1783	#endif /* DEBUG_LIGHTS */
1923	if (MAP_DARKNESS (where->map))	1784	if (MAP_DARKNESS (map))
1924	update_all_los (where->map, where->x, where->y);	1785	update_all_los (map, x, y);
1925	}	1786	}
1926		1787
1927	/* Client has no idea of ordering so lets not bother ordering it here.	1788	/* Client has no idea of ordering so lets not bother ordering it here.
1928	* It sure simplifies this function...	1789	* It sure simplifies this function...
1929	*/	1790	*/
1930	if (where->inv == NULL)	1791	if (!inv)
1931	where->inv = op;	1792	inv = op;
1932	else	1793	else
1933	{	1794	{
1934	op->below = where->inv;	1795	op->below = inv;
1935	op->below->above = op;	1796	op->below->above = op;
1936	where->inv = op;	1797	inv = op;
1937	}	1798	}
		1799
1938	return op;	1800	return op;
1939	}	1801	}
1940		1802
1941	/*	1803	/*
1942	* Checks if any objects has a move_type that matches objects	1804	* Checks if any objects has a move_type that matches objects
…		…
1960	*/	1822	*/
1961		1823
1962	int	1824	int
1963	check_move_on (object *op, object *originator)	1825	check_move_on (object *op, object *originator)
1964	{	1826	{
1965	object *	1827	object *tmp;
1966	tmp;	1828	maptile *m = op->map;
1967	tag_t
1968	tag;
1969	mapstruct *
1970	m = op->map;
1971	int
1972	x = op->x, y = op->y;	1829	int x = op->x, y = op->y;
1973		1830
1974	MoveType	1831	MoveType move_on, move_slow, move_block;
1975	move_on,
1976	move_slow,
1977	move_block;
1978		1832
1979	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1833	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1980	return 0;	1834	return 0;
1981
1982	tag = op->count;
1983		1835
1984	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1836	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1985	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1837	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1986	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1838	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1987		1839
…		…
2048	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1900	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2049	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1901	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2050	{	1902	{
2051	move_apply (tmp, op, originator);	1903	move_apply (tmp, op, originator);
2052		1904
2053	if (was_destroyed (op, tag))	1905	if (op->destroyed ())
2054	return 1;	1906	return 1;
2055		1907
2056	/* what the person/creature stepped onto has moved the object	1908	/* what the person/creature stepped onto has moved the object
2057	* someplace new. Don't process any further - if we did,	1909	* someplace new. Don't process any further - if we did,
2058	* have a feeling strange problems would result.	1910	* have a feeling strange problems would result.
…		…
2070	* a matching archetype at the given map and coordinates.	1922	* a matching archetype at the given map and coordinates.
2071	* The first matching object is returned, or NULL if none.	1923	* The first matching object is returned, or NULL if none.
2072	*/	1924	*/
2073		1925
2074	object *	1926	object *
2075	present_arch (const archetype *at, mapstruct *m, int x, int y)	1927	present_arch (const archetype *at, maptile *m, int x, int y)
2076	{	1928	{
2077	object *	1929	object *
2078	tmp;	1930	tmp;
2079		1931
2080	if (m == NULL || out_of_map (m, x, y))	1932	if (m == NULL || out_of_map (m, x, y))
…		…
2093	* a matching type variable at the given map and coordinates.	1945	* a matching type variable at the given map and coordinates.
2094	* The first matching object is returned, or NULL if none.	1946	* The first matching object is returned, or NULL if none.
2095	*/	1947	*/
2096		1948
2097	object *	1949	object *
2098	present (unsigned char type, mapstruct *m, int x, int y)	1950	present (unsigned char type, maptile *m, int x, int y)
2099	{	1951	{
2100	object *	1952	object *
2101	tmp;	1953	tmp;
2102		1954
2103	if (out_of_map (m, x, y))	1955	if (out_of_map (m, x, y))
…		…
2243	* the archetype because that isn't correct if the monster has been	2095	* the archetype because that isn't correct if the monster has been
2244	* customized, changed states, etc.	2096	* customized, changed states, etc.
2245	*/	2097	*/
2246		2098
2247	int	2099	int
2248	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2100	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2249	{	2101	{
2250	int	2102	int
2251	i,	2103	i,
2252	index = 0, flag;	2104	index = 0, flag;
2253	static int	2105	static int
…		…
2265	* if the space being examined only has a wall to the north and empty	2117	* if the space being examined only has a wall to the north and empty
2266	* spaces in all the other directions, this will reduce the search space	2118	* spaces in all the other directions, this will reduce the search space
2267	* to only the spaces immediately surrounding the target area, and	2119	* to only the spaces immediately surrounding the target area, and
2268	* won't look 2 spaces south of the target space.	2120	* won't look 2 spaces south of the target space.
2269	*/	2121	*/
2270	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2122	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2271	stop = maxfree[i];	2123	stop = maxfree[i];
2272	}	2124	}
		2125
2273	if (!index)	2126	if (!index)
2274	return -1;	2127	return -1;
		2128
2275	return altern[RANDOM () % index];	2129	return altern[RANDOM () % index];
2276	}	2130	}
2277		2131
2278	/*	2132	/*
2279	* find_first_free_spot(archetype, mapstruct, x, y) works like	2133	* find_first_free_spot(archetype, maptile, x, y) works like
2280	* find_free_spot(), but it will search max number of squares.	2134	* find_free_spot(), but it will search max number of squares.
2281	* But it will return the first available spot, not a random choice.	2135	* But it will return the first available spot, not a random choice.
2282	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2136	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2283	*/	2137	*/
2284		2138
2285	int	2139	int
2286	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2140	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2287	{	2141	{
2288	int	2142	int
2289	i;	2143	i;
2290		2144
2291	for (i = 0; i < SIZEOFFREE; i++)	2145	for (i = 0; i < SIZEOFFREE; i++)
…		…
2355	* because we have to know what movement the thing looking to move	2209	* because we have to know what movement the thing looking to move
2356	* there is capable of.	2210	* there is capable of.
2357	*/	2211	*/
2358		2212
2359	int	2213	int
2360	find_dir (mapstruct *m, int x, int y, object *exclude)	2214	find_dir (maptile *m, int x, int y, object *exclude)
2361	{	2215	{
2362	int	2216	int
2363	i,	2217	i,
2364	max = SIZEOFFREE, mflags;	2218	max = SIZEOFFREE, mflags;
2365		2219
2366	sint16 nx, ny;	2220	sint16 nx, ny;
2367	object *	2221	object *
2368	tmp;	2222	tmp;
2369	mapstruct *	2223	maptile *
2370	mp;	2224	mp;
2371		2225
2372	MoveType blocked, move_type;	2226	MoveType blocked, move_type;
2373		2227
2374	if (exclude && exclude->head)	2228	if (exclude && exclude->head)
…		…
2582	* Modified to be map tile aware -.MSW	2436	* Modified to be map tile aware -.MSW
2583	*/	2437	*/
2584		2438
2585		2439
2586	int	2440	int
2587	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2441	can_see_monsterP (maptile *m, int x, int y, int dir)
2588	{	2442	{
2589	sint16 dx, dy;	2443	sint16 dx, dy;
2590	int	2444	int
2591	mflags;	2445	mflags;
2592		2446
…		…
2641	* create clone from object to another	2495	* create clone from object to another
2642	*/	2496	*/
2643	object *	2497	object *
2644	object_create_clone (object *asrc)	2498	object_create_clone (object *asrc)
2645	{	2499	{
2646	object *
2647	dst = NULL, *tmp, *src, *part, *prev, *item;	2500	object *dst = 0, *tmp, *src, *part, *prev, *item;
2648		2501
2649	if (!asrc)	2502	if (!asrc)
2650	return NULL;	2503	return 0;
		2504
2651	src = asrc;	2505	src = asrc;
2652	if (src->head)	2506	if (src->head)
2653	src = src->head;	2507	src = src->head;
2654		2508
2655	prev = NULL;	2509	prev = 0;
2656	for (part = src; part; part = part->more)	2510	for (part = src; part; part = part->more)
2657	{	2511	{
2658	tmp = get_object ();	2512	tmp = part->clone ();
2659	copy_object (part, tmp);
2660	tmp->x -= src->x;	2513	tmp->x -= src->x;
2661	tmp->y -= src->y;	2514	tmp->y -= src->y;
		2515
2662	if (!part->head)	2516	if (!part->head)
2663	{	2517	{
2664	dst = tmp;	2518	dst = tmp;
2665	tmp->head = NULL;	2519	tmp->head = 0;
2666	}	2520	}
2667	else	2521	else
2668	{	2522	{
2669	tmp->head = dst;	2523	tmp->head = dst;
2670	}	2524	}
		2525
2671	tmp->more = NULL;	2526	tmp->more = 0;
		2527
2672	if (prev)	2528	if (prev)
2673	prev->more = tmp;	2529	prev->more = tmp;
		2530
2674	prev = tmp;	2531	prev = tmp;
2675	}	2532	}
2676		2533
2677	/*** copy inventory ***/
2678	for (item = src->inv; item; item = item->below)	2534	for (item = src->inv; item; item = item->below)
2679	{
2680	(void) insert_ob_in_ob (object_create_clone (item), dst);	2535	insert_ob_in_ob (object_create_clone (item), dst);
2681	}
2682		2536
2683	return dst;	2537	return dst;
2684	}	2538	}
2685		2539
2686	/* return true if the object was destroyed, 0 otherwise */
2687	int
2688	was_destroyed (const object *op, tag_t old_tag)
2689	{
2690	/* checking for FLAG_FREED isn't necessary, but makes this function more
2691	* robust */
2692	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2693	}
2694
2695	/* GROS - Creates an object using a string representing its content. */	2540	/* GROS - Creates an object using a string representing its content. */
2696
2697	/* Basically, we save the content of the string to a temp file, then call */	2541	/* Basically, we save the content of the string to a temp file, then call */
2698
2699	/* load_object on it. I admit it is a highly inefficient way to make things, */	2542	/* load_object on it. I admit it is a highly inefficient way to make things, */
2700
2701	/* but it was simple to make and allows reusing the load_object function. */	2543	/* but it was simple to make and allows reusing the load_object function. */
2702
2703	/* Remember not to use load_object_str in a time-critical situation. */	2544	/* Remember not to use load_object_str in a time-critical situation. */
2704
2705	/* Also remember that multiparts objects are not supported for now. */	2545	/* Also remember that multiparts objects are not supported for now. */
2706		2546
2707	object *	2547	object *
2708	load_object_str (const char *obstr)	2548	load_object_str (const char *obstr)
2709	{	2549	{
2710	object *	2550	object *op;
2711	op;
2712	char
2713	filename[MAX_BUF];	2551	char filename[MAX_BUF];
2714		2552
2715	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2553	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2716		2554
2717	FILE *
2718	tempfile = fopen (filename, "w");	2555	FILE *tempfile = fopen (filename, "w");
2719		2556
2720	if (tempfile == NULL)	2557	if (tempfile == NULL)
2721	{	2558	{
2722	LOG (llevError, "Error - Unable to access load object temp file\n");	2559	LOG (llevError, "Error - Unable to access load object temp file\n");
2723	return NULL;	2560	return NULL;
2724	};	2561	}
		2562
2725	fprintf (tempfile, obstr);	2563	fprintf (tempfile, obstr);
2726	fclose (tempfile);	2564	fclose (tempfile);
2727		2565
2728	op = get_object ();	2566	op = object::create ();
2729		2567
2730	object_thawer thawer (filename);	2568	object_thawer thawer (filename);
2731		2569
2732	if (thawer)	2570	if (thawer)
2733	load_object (thawer, op, 0);	2571	load_object (thawer, op, 0);
…		…
2743	* returns NULL if no match.	2581	* returns NULL if no match.
2744	*/	2582	*/
2745	object *	2583	object *
2746	find_obj_by_type_subtype (const object *who, int type, int subtype)	2584	find_obj_by_type_subtype (const object *who, int type, int subtype)
2747	{	2585	{
2748	object *	2586	object *tmp;
2749	tmp;
2750		2587
2751	for (tmp = who->inv; tmp; tmp = tmp->below)	2588	for (tmp = who->inv; tmp; tmp = tmp->below)
2752	if (tmp->type == type && tmp->subtype == subtype)	2589	if (tmp->type == type && tmp->subtype == subtype)
2753	return tmp;	2590	return tmp;
2754		2591
…		…
2762	* do the desired thing.	2599	* do the desired thing.
2763	*/	2600	*/
2764	key_value *	2601	key_value *
2765	get_ob_key_link (const object *ob, const char *key)	2602	get_ob_key_link (const object *ob, const char *key)
2766	{	2603	{
2767	key_value *	2604	key_value *link;
2768	link;
2769		2605
2770	for (link = ob->key_values; link != NULL; link = link->next)	2606	for (link = ob->key_values; link != NULL; link = link->next)
2771	{
2772	if (link->key == key)	2607	if (link->key == key)
2773	{
2774	return link;	2608	return link;
2775	}
2776	}
2777		2609
2778	return NULL;	2610	return NULL;
2779	}	2611	}
2780		2612
2781	/*	2613	/*
…		…
2786	* The returned string is shared.	2618	* The returned string is shared.
2787	*/	2619	*/
2788	const char *	2620	const char *
2789	get_ob_key_value (const object *op, const char *const key)	2621	get_ob_key_value (const object *op, const char *const key)
2790	{	2622	{
2791	key_value *	2623	key_value *link;
2792	link;	2624	shstr_cmp canonical_key (key);
2793	const char *
2794	canonical_key;
2795		2625
2796	canonical_key = shstr::find (key);
2797
2798	if (canonical_key == NULL)	2626	if (!canonical_key)
2799	{	2627	{
2800	/* 1. There being a field named key on any object	2628	/* 1. There being a field named key on any object
2801	* implies there'd be a shared string to find.	2629	* implies there'd be a shared string to find.
2802	* 2. Since there isn't, no object has this field.	2630	* 2. Since there isn't, no object has this field.
2803	* 3. Therefore, *this* object doesn't have this field.	2631	* 3. Therefore, *this* object doesn't have this field.
2804	*/	2632	*/
2805	return NULL;	2633	return 0;
2806	}	2634	}
2807		2635
2808	/* This is copied from get_ob_key_link() above -	2636	/* This is copied from get_ob_key_link() above -
2809	* only 4 lines, and saves the function call overhead.	2637	* only 4 lines, and saves the function call overhead.
2810	*/	2638	*/
2811	for (link = op->key_values; link != NULL; link = link->next)	2639	for (link = op->key_values; link; link = link->next)
2812	{
2813	if (link->key == canonical_key)	2640	if (link->key == canonical_key)
2814	{
2815	return link->value;	2641	return link->value;
2816	}	2642
2817	}
2818	return NULL;	2643	return 0;
2819	}	2644	}
2820		2645
2821		2646
2822	/*	2647	/*
2823	* Updates the canonical_key in op to value.	2648	* Updates the canonical_key in op to value.
…		…
2908	{	2733	{
2909	shstr key_ (key);	2734	shstr key_ (key);
2910		2735
2911	return set_ob_key_value_s (op, key_, value, add_key);	2736	return set_ob_key_value_s (op, key_, value, add_key);
2912	}	2737	}
		2738
		2739	object::depth_iterator::depth_iterator (object *container)
		2740	: iterator_base (container)
		2741	{
		2742	while (item->inv)
		2743	item = item->inv;
		2744	}
		2745
		2746	void
		2747	object::depth_iterator::next ()
		2748	{
		2749	if (item->below)
		2750	{
		2751	item = item->below;
		2752
		2753	while (item->inv)
		2754	item = item->inv;
		2755	}
		2756	else
		2757	item = item->env;
		2758	}
		2759
		2760	// return a suitable string describing an objetc in enough detail to find it
		2761	const char *
		2762	object::debug_desc (char *info) const
		2763	{
		2764	char info2[256 * 3];
		2765	char *p = info;
		2766
		2767	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2768	count,
		2769	&name,
		2770	title ? " " : "",
		2771	title ? (const char *)title : "");
		2772
		2773	if (env)
		2774	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2775
		2776	if (map)
		2777	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2778
		2779	return info;
		2780	}
		2781
		2782	const char *
		2783	object::debug_desc () const
		2784	{
		2785	static char info[256 * 3];
		2786	return debug_desc (info);
		2787	}
		2788

Diff Legend

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