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.7 by root, Tue Aug 29 05:03:54 2006 UTC vs.
Revision 1.15 by root, Mon Sep 4 13:55:54 2006 UTC

1	/*	1	/*
2	* static char *rcsid_object_c =	2	* static char *rcsid_object_c =
3	* "$Id: object.C,v 1.7 2006/08/29 05:03:54 root Exp $";	3	* "$Id: object.C,v 1.15 2006/09/04 13:55:54 root Exp $";
4	*/	4	*/
5		5
6	/*	6	/*
7	CrossFire, A Multiplayer game for X-windows	7	CrossFire, A Multiplayer game for X-windows
8		8
…		…
37	#endif /* win32 */	37	#endif /* win32 */
38	#include <object.h>	38	#include <object.h>
39	#include <funcpoint.h>	39	#include <funcpoint.h>
40	#include <skills.h>	40	#include <skills.h>
41	#include <loader.h>	41	#include <loader.h>
42	#ifdef MEMORY_DEBUG
43	int nroffreeobjects = 0;
44	int nrofallocobjects = 0;	42	int nrofallocobjects = 0;
45	#undef OBJ_EXPAND
46	#define OBJ_EXPAND 1
47	#else
48	object objarray[STARTMAX]; /* All objects, allocated this way at first */
49	int nroffreeobjects = STARTMAX; /* How many OBs allocated and free (free) */
50	int nrofallocobjects = STARTMAX; /* How many OBs allocated (free + used) */
51	#endif
52		43
53	object *objects; /* Pointer to the list of used objects */	44	object *objects; /* Pointer to the list of used objects */
54	object *free_objects; /* Pointer to the list of unused objects */
55	object *active_objects; /* List of active objects that need to be processed */	45	object *active_objects; /* List of active objects that need to be processed */
56		46
57	short freearr_x[SIZEOFFREE]=	47	short freearr_x[SIZEOFFREE]=
58	{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,	48	{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,
59	0,1,2,3,3,3,3,3,3,3,2,1,0,-1,-2,-3,-3,-3,-3,-3,-3,-3,-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};
60	short freearr_y[SIZEOFFREE]=	50	short freearr_y[SIZEOFFREE]=
…		…
132	/* Note sure why the following is the case - either the object has to	122	/* Note sure why the following is the case - either the object has to
133	* be animated or have a very low speed. Is this an attempted monster	123	* be animated or have a very low speed. Is this an attempted monster
134	* check?	124	* check?
135	*/	125	*/
136	if (!QUERY_FLAG(ob1,FLAG_ANIMATE) && FABS((ob1)->speed) > MIN_ACTIVE_SPEED)	126	if (!QUERY_FLAG(ob1,FLAG_ANIMATE) && FABS((ob1)->speed) > MIN_ACTIVE_SPEED)
137	return 0;	127	return 0;
138		128
139	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	129	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
140	* value could not be stored in a sint32 (which unfortunately sometimes is	130	* value could not be stored in a sint32 (which unfortunately sometimes is
141	* used to store nrof).	131	* used to store nrof).
142	*/	132	*/
143	if (ob1->nrof+ob2->nrof >= 1UL<<31)	133	if (ob1->nrof+ob2->nrof >= 1UL<<31)
144	return 0;	134	return 0;
145		135
146	/* This is really a spellbook check - really, we should	136	/* This is really a spellbook check - really, we should
147	* check all objects in the inventory.	137	* check all objects in the inventory.
148	*/	138	*/
149	if (ob1->inv || ob2->inv) {	139	if (ob1->inv || ob2->inv) {
150	/* if one object has inventory but the other doesn't, not equiv */	140	/* if one object has inventory but the other doesn't, not equiv */
151	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) return 0;	141	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) return 0;
152		142
153	/* Now check to see if the two inventory objects could merge */	143	/* Now check to see if the two inventory objects could merge */
154	if (!CAN_MERGE(ob1->inv, ob2->inv)) return 0;	144	if (!CAN_MERGE(ob1->inv, ob2->inv)) return 0;
155		145
156	/* inventory ok - still need to check rest of this object to see	146	/* inventory ok - still need to check rest of this object to see
157	* if it is valid.	147	* if it is valid.
158	*/	148	*/
159	}	149	}
160		150
161	/* If the objects have been identified, set the BEEN_APPLIED flag.	151	/* If the objects have been identified, set the BEEN_APPLIED flag.
162	* This is to the comparison of the flags below will be OK. We	152	* This is to the comparison of the flags below will be OK. We
163	* just can't ignore the been applied or identified flags, as they	153	* just can't ignore the been applied or identified flags, as they
164	* are not equal - just if it has been identified, the been_applied	154	* are not equal - just if it has been identified, the been_applied
165	* flags lose any meaning.	155	* flags lose any meaning.
166	*/	156	*/
167	if (QUERY_FLAG(ob1, FLAG_IDENTIFIED))	157	if (QUERY_FLAG(ob1, FLAG_IDENTIFIED))
168	SET_FLAG(ob1, FLAG_BEEN_APPLIED);	158	SET_FLAG(ob1, FLAG_BEEN_APPLIED);
169		159
170	if (QUERY_FLAG(ob2, FLAG_IDENTIFIED))	160	if (QUERY_FLAG(ob2, FLAG_IDENTIFIED))
171	SET_FLAG(ob2, FLAG_BEEN_APPLIED);	161	SET_FLAG(ob2, FLAG_BEEN_APPLIED);
172		162
173		163
174	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	164	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something
175	* being locked in inventory should prevent merging.	165	* being locked in inventory should prevent merging.
176	* 0x4 in flags3 is CLIENT_SENT	166	* 0x4 in flags3 is CLIENT_SENT
177	*/	167	*/
178	if ((ob1->arch != ob2->arch) ||	168	if ((ob1->arch != ob2->arch) ||
179	(ob1->flags[0] != ob2->flags[0]) ||	169	(ob1->flags[0] != ob2->flags[0]) ||
180	(ob1->flags[1] != ob2->flags[1]) ||	170	(ob1->flags[1] != ob2->flags[1]) ||
181	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~ 0x400000)) ||	171	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~ 0x400000)) ||
182	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||	172	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
183	(ob1->name != ob2->name) ||	173	(ob1->name != ob2->name) ||
184	(ob1->title != ob2->title) ||	174	(ob1->title != ob2->title) ||
185	(ob1->msg != ob2->msg) ||	175	(ob1->msg != ob2->msg) ||
186	(ob1->weight != ob2->weight) ||	176	(ob1->weight != ob2->weight) ||
187	(memcmp(&ob1->resist, &ob2->resist, sizeof(ob1->resist))!=0) ||	177	(memcmp(&ob1->resist, &ob2->resist, sizeof(ob1->resist))!=0) ||
188	(memcmp(&ob1->stats, &ob2->stats, sizeof(ob1->stats))!=0) ||	178	(memcmp(&ob1->stats, &ob2->stats, sizeof(ob1->stats))!=0) ||
189	(ob1->attacktype != ob2->attacktype) ||	179	(ob1->attacktype != ob2->attacktype) ||
190	(ob1->magic != ob2->magic) ||	180	(ob1->magic != ob2->magic) ||
191	(ob1->slaying != ob2->slaying) ||	181	(ob1->slaying != ob2->slaying) ||
192	(ob1->skill != ob2->skill) ||	182	(ob1->skill != ob2->skill) ||
193	(ob1->value != ob2->value) ||	183	(ob1->value != ob2->value) ||
194	(ob1->animation_id != ob2->animation_id) ||	184	(ob1->animation_id != ob2->animation_id) ||
195	(ob1->client_type != ob2->client_type) ||	185	(ob1->client_type != ob2->client_type) ||
196	(ob1->materialname != ob2->materialname) ||	186	(ob1->materialname != ob2->materialname) ||
197	(ob1->lore != ob2->lore) ||	187	(ob1->lore != ob2->lore) ||
198	(ob1->subtype != ob2->subtype) ||	188	(ob1->subtype != ob2->subtype) ||
199	(ob1->move_type != ob2->move_type) ||	189	(ob1->move_type != ob2->move_type) ||
200	(ob1->move_block != ob2->move_block) ||	190	(ob1->move_block != ob2->move_block) ||
201	(ob1->move_allow != ob2->move_allow) ||	191	(ob1->move_allow != ob2->move_allow) ||
202	(ob1->move_on != ob2->move_on) ||	192	(ob1->move_on != ob2->move_on) ||
203	(ob1->move_off != ob2->move_off) ||	193	(ob1->move_off != ob2->move_off) ||
204	(ob1->move_slow != ob2->move_slow) ||	194	(ob1->move_slow != ob2->move_slow) ||
205	(ob1->move_slow_penalty != ob2->move_slow_penalty)	195	(ob1->move_slow_penalty != ob2->move_slow_penalty)
206	)	196	)
207	return 0;	197	return 0;
208		198
209	/* Don't merge objects that are applied. With the new 'body' code,	199	/* Don't merge objects that are applied. With the new 'body' code,
210	* it is possible for most any character to have more than one of	200	* it is possible for most any character to have more than one of
211	* some items equipped, and we don't want those to merge.	201	* some items equipped, and we don't want those to merge.
212	*/	202	*/
213	if (QUERY_FLAG(ob1, FLAG_APPLIED) || QUERY_FLAG(ob2, FLAG_APPLIED))	203	if (QUERY_FLAG(ob1, FLAG_APPLIED) || QUERY_FLAG(ob2, FLAG_APPLIED))
214	return 0;	204	return 0;
215		205
216	switch (ob1->type) {	206	switch (ob1->type) {
217	case SCROLL:	207	case SCROLL:
218	if (ob1->level != ob2->level) return 0;	208	if (ob1->level != ob2->level) return 0;
219	break;	209	break;
220		210
221	}	211	}
222	if (ob1->key_values != NULL || ob2->key_values != NULL) {	212	if (ob1->key_values != NULL || ob2->key_values != NULL) {
223	/* At least one of these has key_values. */	213	/* At least one of these has key_values. */
224	if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) {	214	if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) {
…		…
241	signed long sum_weight(object *op) {	231	signed long sum_weight(object *op) {
242	signed long sum;	232	signed long sum;
243	object *inv;	233	object *inv;
244	for(sum = 0, inv = op->inv; inv != NULL; inv = inv->below) {	234	for(sum = 0, inv = op->inv; inv != NULL; inv = inv->below) {
245	if (inv->inv)	235	if (inv->inv)
246	sum_weight(inv);	236	sum_weight(inv);
247	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	237	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
248	}	238	}
249	if (op->type == CONTAINER && op->stats.Str)	239	if (op->type == CONTAINER && op->stats.Str)
250	sum = (sum * (100 - op->stats.Str))/100;	240	sum = (sum * (100 - op->stats.Str))/100;
251	if(op->carrying != sum)	241	if(op->carrying != sum)
…		…
270	*/	260	*/
271		261
272	object *is_player_inv (object *op) {	262	object *is_player_inv (object *op) {
273	for (;op!=NULL&&op->type!=PLAYER; op=op->env)	263	for (;op!=NULL&&op->type!=PLAYER; op=op->env)
274	if (op->env==op)	264	if (op->env==op)
275	op->env = NULL;	265	op->env = NULL;
276	return op;	266	return op;
277	}	267	}
278		268
279	/*	269	/*
280	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	270	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
281	* Some error messages.	271	* Some error messages.
282	* The result of the dump is stored in the static global errmsg array.	272	* The result of the dump is stored in the static global errmsg array.
283	*/	273	*/
284		274
285	void dump_object2(object *op) {	275	void dump_object2(object *op) {
		276	errmsg[0] = 0;
		277	return;
		278	//TODO//D#d#
		279	#if 0
286	char *cp;	280	char *cp;
287	/* object *tmp;*/	281	/* object *tmp;*/
288		282
289	if(op->arch!=NULL) {	283	if(op->arch!=NULL) {
290	strcat(errmsg,"arch ");	284	strcat(errmsg,"arch ");
291	strcat(errmsg,op->arch->name?op->arch->name:"(null)");	285	strcat(errmsg,op->arch->name?op->arch->name:"(null)");
292	strcat(errmsg,"\n");	286	strcat(errmsg,"\n");
293	if((cp=get_ob_diff(op,&empty_archetype->clone))!=NULL)	287	if((cp=get_ob_diff(op,&empty_archetype->clone))!=NULL)
294	strcat(errmsg,cp);	288	strcat(errmsg,cp);
295	#if 0	289	#if 0
296	/* Don't dump player diffs - they are too long, mostly meaningless, and	290	/* Don't dump player diffs - they are too long, mostly meaningless, and
297	* will overflow the buffer.	291	* will overflow the buffer.
298	* Changed so that we don't dump inventory either. This may	292	* Changed so that we don't dump inventory either. This may
299	* also overflow the buffer.	293	* also overflow the buffer.
…		…
315	for (tmp=op->inv; tmp; tmp=tmp->below)	309	for (tmp=op->inv; tmp; tmp=tmp->below)
316	dump_object2(tmp);	310	dump_object2(tmp);
317	#endif	311	#endif
318	strcat(errmsg,"end\n");	312	strcat(errmsg,"end\n");
319	}	313	}
		314	#endif
320	}	315	}
321		316
322	/*	317	/*
323	* Dumps an object. Returns output in the static global errmsg array.	318	* Dumps an object. Returns output in the static global errmsg array.
324	*/	319	*/
…		…
329	return;	324	return;
330	}	325	}
331	errmsg[0]='\0';	326	errmsg[0]='\0';
332	dump_object2(op);	327	dump_object2(op);
333	}	328	}
334
335	/* GROS - Dumps an object. Return the result into a string */
336	/* Note that no checking is done for the validity of the target string, so */
337	/* you need to be sure that you allocated enough space for it. */
338	void dump_me(object *op, char *outstr)
339	{
340	char *cp;
341
342	if(op==NULL)
343	{
344	strcpy(outstr,"[NULL pointer]");
345	return;
346	}
347	outstr[0]='\0';
348
349	if(op->arch!=NULL)
350	{
351	strcat(outstr,"arch ");
352	strcat(outstr,op->arch->name?op->arch->name:"(null)");
353	strcat(outstr,"\n");
354	if((cp=get_ob_diff(op,&empty_archetype->clone))!=NULL)
355	strcat(outstr,cp);
356	strcat(outstr,"end\n");
357	}
358	else
359	{
360	strcat(outstr,"Object ");
361	if (op->name==NULL)
362	strcat(outstr, "(null)");
363	else
364	strcat(outstr,op->name);
365	strcat(outstr,"\n");
366	strcat(outstr,"end\n");
367	}
368	}
369
370	/*
371	* This is really verbose...Can be triggered by the P key while in DM mode.
372	* All objects are dumped to stderr (or alternate logfile, if in server-mode)
373	*/
374		329
375	void dump_all_objects(void) {	330	void dump_all_objects(void) {
376	object *op;	331	object *op;
377	for(op=objects;op!=NULL;op=op->next) {	332	for(op=objects;op!=NULL;op=op->next) {
378	dump_object(op);	333	dump_object(op);
…		…
414	* Used only by the patch command, but not all that useful.	369	* Used only by the patch command, but not all that useful.
415	* Enables features like "patch <name-of-other-player> food 999"	370	* Enables features like "patch <name-of-other-player> food 999"
416	*/	371	*/
417		372
418	object *find_object_name(const char *str) {	373	object *find_object_name(const char *str) {
419	const char *name=add_string(str);	374	const char *name = shstr::find (str);
420	object *op;	375	object *op;
421	for(op=objects;op!=NULL;op=op->next)	376	for(op=objects;op!=NULL;op=op->next)
422	if(op->name==name)	377	if(&op->name == name)
423	break;	378	break;
424	free_string(name);	379
425	return op;	380	return op;
426	}	381	}
427		382
428	void free_all_object_data(void) {	383	void free_all_object_data ()
429	#ifdef MEMORY_DEBUG	384	{
430	object *op, *next;	385	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
431
432	for (op=free_objects; op!=NULL; ) {
433	next=op->next;
434	free(op);
435	nrofallocobjects--;
436	nroffreeobjects--;
437	op=next;
438	}
439	#endif
440	LOG(llevDebug,"%d allocated objects, %d free objects, STARMAX=%d\n",
441	nrofallocobjects, nroffreeobjects,STARTMAX);
442	}	386	}
443		387
444	/*	388	/*
445	* Returns the object which this object marks as being the owner.	389	* 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	390	* A id-scheme is used to avoid pointing to objects which have been
…		…
452	* anything - once an object is removed, it is basically dead anyways.	396	* anything - once an object is removed, it is basically dead anyways.
453	*/	397	*/
454		398
455	object *get_owner(object *op) {	399	object *get_owner(object *op) {
456	if(op->owner==NULL)	400	if(op->owner==NULL)
457	return NULL;	401	return NULL;
458		402
459	if (!QUERY_FLAG(op->owner,FLAG_FREED) && !QUERY_FLAG(op->owner, FLAG_REMOVED) &&	403	if (!QUERY_FLAG(op->owner,FLAG_FREED) && !QUERY_FLAG(op->owner, FLAG_REMOVED) &&
460	op->owner->count==op->ownercount)	404	op->owner->count==op->ownercount)
461	return op->owner;	405	return op->owner;
462		406
463	op->owner=NULL;	407	op->owner=NULL;
464	op->ownercount=0;	408	op->ownercount=0;
465	return NULL;	409	return NULL;
466	}	410	}
…		…
468	void clear_owner(object *op)	412	void clear_owner(object *op)
469	{	413	{
470	if (!op) return;	414	if (!op) return;
471		415
472	if (op->owner && op->ownercount == op->owner->count)	416	if (op->owner && op->ownercount == op->owner->count)
473	op->owner->refcount--;	417	op->owner->refcount--;
474		418
475	op->owner = NULL;	419	op->owner = NULL;
476	op->ownercount = 0;	420	op->ownercount = 0;
477	}	421	}
478
479
480		422
481	/*	423	/*
482	* Sets the owner and sets the skill and exp pointers to owner's current	424	* Sets the owner and sets the skill and exp pointers to owner's current
483	* skill and experience objects.	425	* skill and experience objects.
484	*/	426	*/
485	void set_owner (object *op, object *owner)	427	void set_owner (object *op, object *owner)
486	{	428	{
487	if(owner==NULL||op==NULL)	429	if(owner==NULL||op==NULL)
488	return;	430	return;
489		431
490	/* next line added to allow objects which own objects */	432	/* next line added to allow objects which own objects */
491	/* Add a check for ownercounts in here, as I got into an endless loop	433	/* Add a check for ownercounts in here, as I got into an endless loop
492	* with the fireball owning a poison cloud which then owned the	434	* with the fireball owning a poison cloud which then owned the
493	* fireball. I believe that was caused by one of the objects getting	435	* fireball. I believe that was caused by one of the objects getting
494	* freed and then another object replacing it. Since the ownercounts	436	* freed and then another object replacing it. Since the ownercounts
495	* didn't match, this check is valid and I believe that cause is valid.	437	* didn't match, this check is valid and I believe that cause is valid.
496	*/	438	*/
497	while (owner->owner && owner!=owner->owner &&	439	while (owner->owner && owner!=owner->owner &&
498	owner->ownercount==owner->owner->count) owner=owner->owner;	440	owner->ownercount==owner->owner->count) owner=owner->owner;
499		441
500	/* IF the owner still has an owner, we did not resolve to a final owner.	442	/* IF the owner still has an owner, we did not resolve to a final owner.
501	* so lets not add to that.	443	* so lets not add to that.
502	*/	444	*/
503	if (owner->owner) return;	445	if (owner->owner) return;
…		…
521	*/	463	*/
522	void copy_owner (object *op, object *clone)	464	void copy_owner (object *op, object *clone)
523	{	465	{
524	object *owner = get_owner (clone);	466	object *owner = get_owner (clone);
525	if (owner == NULL) {	467	if (owner == NULL) {
526	/* players don't have owners - they own themselves. Update	468	/* players don't have owners - they own themselves. Update
527	* as appropriate.	469	* as appropriate.
528	*/	470	*/
529	if (clone->type == PLAYER) owner=clone;	471	if (clone->type == PLAYER) owner=clone;
530	else return;	472	else return;
531	}	473	}
532	set_owner(op, owner);	474	set_owner(op, owner);
533		475
534	}
535
536	/*
537	* Resets vital variables in an object
538	*/
539
540	void reset_object(object *op) {
541
542	op->name = NULL;
543	op->name_pl = NULL;
544	op->title = NULL;
545	op->race = NULL;
546	op->slaying = NULL;
547	op->skill = NULL;
548	op->msg = NULL;
549	op->materialname = NULL;
550	op->lore = NULL;
551	clear_object(op);
552	}	476	}
553		477
554	/* Zero the key_values on op, decrementing the shared-string	478	/* Zero the key_values on op, decrementing the shared-string
555	* refcounts and freeing the links.	479	* refcounts and freeing the links.
556	*/	480	*/
557	static void free_key_values(object * op) {	481	static void free_key_values(object * op)
558	key_value * i;	482	{
559	key_value * next = NULL;	483	for (key_value *i = op->key_values; i != 0; )
560		484	{
561	if (op->key_values == NULL) return;	485	key_value *next = i->next;
		486	delete i;
		487	i = next;
562		488	}
563	for (i = op->key_values; i != NULL; i = next) {	489
564	/* Store next *first*. */
565	next = i->next;
566
567	if (i->key) FREE_AND_CLEAR_STR(i->key);
568	if (i->value) FREE_AND_CLEAR_STR(i->value);
569	i->next = NULL;
570	free(i);
571	}
572
573	op->key_values = NULL;	490	op->key_values = 0;
574	}	491	}
575		492
		493	void object::clear ()
		494	{
		495	attachable_base::clear ();
		496
		497	free_key_values (this);
		498
		499	name = 0;
		500	name_pl = 0;
		501	title = 0;
		502	race = 0;
		503	slaying = 0;
		504	skill = 0;
		505	msg = 0;
		506	lore = 0;
		507	custom_name = 0;
		508	materialname = 0;
		509
		510	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
		511
		512	SET_FLAG (this, FLAG_REMOVED);
		513	}
		514
		515	void object::clone (object *destination)
		516	{
		517	*(object_copy *)destination = *(object_copy *)this;
		518	*(object_pod *)destination = *(object_pod *)this;
		519
		520	if (self || cb)
		521	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
		522	}
576		523
577	/*	524	/*
578	* clear_object() frees everything allocated by an object, and also	525	* clear_object() frees everything allocated by an object, and also
579	* clears all variables and flags to default settings.	526	* clears all variables and flags to default settings.
580	*/	527	*/
581		528
582	void clear_object(object *op) {	529	void clear_object (object *op)
		530	{
583	op->clear ();	531	op->clear ();
584		532
585	event *evt;
586	event *evt2;
587
588	/* redo this to be simpler/more efficient. Was also seeing
589	* crashes in the old code. Move this to the top - am
590	* seeing periodic crashes in this code, and would like to have
591	* as much info available as possible (eg, object name).
592	*/
593	for (evt = op->events; evt; evt=evt2) {
594	evt2 = evt->next;
595
596	if (evt->hook != NULL) FREE_AND_CLEAR_STR(evt->hook);
597	if (evt->plugin != NULL) FREE_AND_CLEAR_STR(evt->plugin);
598	if (evt->options != NULL) FREE_AND_CLEAR_STR(evt->options);
599
600	free(evt);
601	}
602	op->events = NULL;
603
604	free_key_values(op);
605
606	/* the memset will clear all these values for us, but we need
607	* to reduce the refcount on them.
608	*/
609	if (op->name!=NULL) FREE_AND_CLEAR_STR(op->name);
610	if (op->name_pl!=NULL) FREE_AND_CLEAR_STR(op->name_pl);
611	if (op->title != NULL) FREE_AND_CLEAR_STR(op->title);
612	if (op->race!=NULL) FREE_AND_CLEAR_STR(op->race);
613	if (op->slaying!=NULL) FREE_AND_CLEAR_STR(op->slaying);
614	if (op->skill!=NULL) FREE_AND_CLEAR_STR(op->skill);
615	if (op->msg!=NULL) FREE_AND_CLEAR_STR(op->msg);
616	if (op->lore!=NULL) FREE_AND_CLEAR_STR(op->lore);
617	if (op->materialname!= NULL) FREE_AND_CLEAR_STR(op->materialname);
618
619
620	memset((void*)op, 0, sizeof (object_special));
621	/* Below here, we clear things that are not done by the memset,
622	* or set default values that are not zero.
623	*/
624	/* This is more or less true */
625	SET_FLAG(op, FLAG_REMOVED);
626
627
628	op->contr = NULL;	533	op->contr = NULL;
629	op->below=NULL;	534	op->below = NULL;
630	op->above=NULL;	535	op->above = NULL;
631	op->inv=NULL;	536	op->inv = NULL;
632	op->events=NULL;
633	op->container=NULL;	537	op->container=NULL;
634	op->env=NULL;	538	op->env=NULL;
635	op->more=NULL;	539	op->more=NULL;
636	op->head=NULL;	540	op->head=NULL;
637	op->map=NULL;	541	op->map=NULL;
638	op->refcount=0;	542	op->refcount=0;
639	op->active_next = NULL;	543	op->active_next = NULL;
640	op->active_prev = NULL;	544	op->active_prev = NULL;
641	/* What is not cleared is next, prev, and count */	545	/* What is not cleared is next, prev, and count */
642		546
643	op->expmul=1.0;	547	op->expmul = 1.0;
644	op->face = blank_face;	548	op->face = blank_face;
645	op->attacked_by_count = (tag_t) -1;	549	op->attacked_by_count = -1;
		550
646	if (settings.casting_time)	551	if (settings.casting_time)
647	op->casting_time = -1;	552	op->casting_time = -1;
648
649	}	553	}
650		554
651	/*	555	/*
652	* copy object first frees everything allocated by the second object,	556	* copy object first frees everything allocated by the second object,
653	* and then copies the contends of the first object into the second	557	* and then copies the contends of the first object into the second
…		…
655	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	559	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
656	* if the first object is freed, the pointers in the new object	560	* if the first object is freed, the pointers in the new object
657	* will point at garbage.	561	* will point at garbage.
658	*/	562	*/
659		563
660	void copy_object(object *op2, object *op) {	564	void copy_object (object *op2, object *op)
661	int is_freed=QUERY_FLAG(op,FLAG_FREED),is_removed=QUERY_FLAG(op,FLAG_REMOVED);	565	{
662	event *evt, *evt2, *evt_new;	566	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
		567	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
663		568
664	op->clear ();
665
666	/* Decrement the refcounts, but don't bother zeroing the fields;
667	they'll be overwritten by memcpy. */
668	if(op->name!=NULL) free_string(op->name);
669	if(op->name_pl!=NULL) free_string(op->name_pl);
670	if(op->title!=NULL) free_string(op->title);
671	if(op->race!=NULL) free_string(op->race);
672	if(op->slaying!=NULL) free_string(op->slaying);
673	if(op->skill!=NULL) free_string(op->skill);
674	if(op->msg!=NULL) free_string(op->msg);
675	if(op->lore!=NULL) free_string(op->lore);
676	if(op->materialname != NULL) free_string(op->materialname);
677	if(op->custom_name != NULL) free_string(op->custom_name);
678
679	/* Basically, same code as from clear_object() */
680	for (evt = op->events; evt; evt=evt2) {
681	evt2 = evt->next;
682
683	if (evt->hook != NULL) FREE_AND_CLEAR_STR(evt->hook);
684	if (evt->plugin != NULL) FREE_AND_CLEAR_STR(evt->plugin);
685	if (evt->options != NULL) FREE_AND_CLEAR_STR(evt->options);
686
687	free(evt);
688	}
689	op->events = NULL;
690
691	free_key_values(op);
692
693	*(object_special *)op = *(object_special *)op2;
694	op2->clone (op);	569	op2->clone (op);
695		570
696	if(is_freed) SET_FLAG(op,FLAG_FREED);	571	if (is_freed) SET_FLAG (op, FLAG_FREED);
697	if(is_removed) SET_FLAG(op,FLAG_REMOVED);	572	if (is_removed) SET_FLAG (op, FLAG_REMOVED);
698	if(op->name!=NULL) add_refcount(op->name);
699	if(op->name_pl!=NULL) add_refcount(op->name_pl);
700	if(op->title!=NULL) add_refcount(op->title);
701	if(op->race!=NULL) add_refcount(op->race);
702	if(op->slaying!=NULL) add_refcount(op->slaying);
703	if(op->skill!=NULL) add_refcount(op->skill);
704	if(op->lore!=NULL) add_refcount(op->lore);
705	if(op->msg!=NULL) add_refcount(op->msg);
706	if(op->custom_name!=NULL) add_refcount(op->custom_name);
707	if (op->materialname != NULL) add_refcount(op->materialname);
708		573
709	if((op2->speed<0) && !editor)	574	if (op2->speed < 0)
710	op->speed_left=op2->speed_left-RANDOM()%200/100.0;	575	op->speed_left = op2->speed_left - RANDOM() % 200 / 100.0;
711		576
712	/* Copy over event information */
713	evt2 = NULL;
714	for (evt = op2->events; evt; evt=evt->next) {
715	evt_new = (event *) malloc(sizeof(event));
716	memcpy(evt_new, evt, sizeof(event));
717	if (evt_new->hook) add_refcount(evt_new->hook);
718	if (evt_new->plugin) add_refcount(evt_new->plugin);
719	if (evt_new->options) add_refcount(evt_new->options);
720	evt_new->next = NULL;
721
722	/* Try to be a little clever here, and store away the
723	* last event we copied, so that its simpler to update the
724	* pointer.
725	*/
726	if (evt2)
727	evt2->next = evt_new;
728	else
729	op->events = evt_new;
730
731	evt2 = evt_new;
732	}
733	/* Copy over key_values, if any. */	577	/* Copy over key_values, if any. */
734	if (op2->key_values != NULL) {	578	if (op2->key_values != NULL)
		579	{
735	key_value * tail = NULL;	580	key_value *tail = NULL;
736	key_value * i;	581	key_value *i;
737		582
738	op->key_values = NULL;	583	op->key_values = NULL;
739		584
740	for (i = op2->key_values; i != NULL; i = i->next) {	585	for (i = op2->key_values; i != NULL; i = i->next)
741	key_value * new_link = (key_value *) malloc(sizeof(key_value));	586	{
		587	key_value *new_link = new key_value;
742		588
743	new_link->next = NULL;	589	new_link->next = NULL;
744	new_link->key = add_refcount(i->key);	590	new_link->key = i->key;
745	if (i->value)	591	new_link->value = i->value;
746	new_link->value = add_refcount(i->value);
747	else
748	new_link->value = NULL;
749		592
750	/* Try and be clever here, too. */	593	/* Try and be clever here, too. */
751	if (op->key_values == NULL) {	594	if (op->key_values == NULL)
		595	{
752	op->key_values = new_link;	596	op->key_values = new_link;
753	tail = new_link;	597	tail = new_link;
754	} else {	598	}
755	tail->next = new_link;	599	else
756	tail = new_link;	600	{
		601	tail->next = new_link;
		602	tail = new_link;
		603	}
		604	}
757	}	605	}
758	}
759	}
760		606
761	update_ob_speed(op);	607	update_ob_speed (op);
762	}
763
764	/*
765	* expand_objects() allocates more objects for the list of unused objects.
766	* It is called from get_object() if the unused list is empty.
767	*/
768
769	void expand_objects(void) {
770	int i;
771	object *obj;
772	obj = (object *) CALLOC(OBJ_EXPAND,sizeof(object));
773
774	if(obj==NULL)
775	fatal(OUT_OF_MEMORY);
776	free_objects=obj;
777	obj[0].prev=NULL;
778	obj[0].next= &obj[1],
779	SET_FLAG(&(obj[0]), FLAG_REMOVED);
780	SET_FLAG(&(obj[0]), FLAG_FREED);
781
782	for(i=1;i<OBJ_EXPAND-1;i++) {
783	obj[i].next= &obj[i+1],
784	obj[i].prev= &obj[i-1],
785	SET_FLAG(&(obj[i]), FLAG_REMOVED);
786	SET_FLAG(&(obj[i]), FLAG_FREED);
787	}
788	obj[OBJ_EXPAND-1].prev= &obj[OBJ_EXPAND-2],
789	obj[OBJ_EXPAND-1].next=NULL,
790	SET_FLAG(&(obj[OBJ_EXPAND-1]), FLAG_REMOVED);
791	SET_FLAG(&(obj[OBJ_EXPAND-1]), FLAG_FREED);
792
793	nrofallocobjects += OBJ_EXPAND;
794	nroffreeobjects += OBJ_EXPAND;
795	}	608	}
796		609
797	/*	610	/*
798	* get_object() grabs an object from the list of unused objects, makes	611	* get_object() grabs an object from the list of unused objects, makes
799	* sure it is initialised, and returns it.	612	* sure it is initialised, and returns it.
800	* If there are no free objects, expand_objects() is called to get more.	613	* If there are no free objects, expand_objects() is called to get more.
801	*/	614	*/
802		615
803	object *get_object(void) {	616	object *get_object ()
		617	{
		618	object *op = new object;
		619
		620	op->count = ++ob_count;
		621
		622	op->active_next = 0;
		623	op->active_prev = 0;
		624
		625	op->next = objects;
		626	op->prev = 0;
		627
		628	if (objects)
		629	objects->prev = op;
		630
804	object *op;	631	objects = op;
805		632
806	if(free_objects==NULL) {
807	expand_objects();
808	}
809	op=free_objects;
810	#ifdef MEMORY_DEBUG
811	/* The idea is hopefully by doing a realloc, the memory
812	* debugging program will now use the current stack trace to
813	* report leaks.
814	*/
815	op = realloc(op, sizeof(object));
816	SET_FLAG(op, FLAG_REMOVED);	633	SET_FLAG (op, FLAG_REMOVED);
817	SET_FLAG(op, FLAG_FREED);
818	#endif
819		634
820	if(!QUERY_FLAG(op,FLAG_FREED)) {	635	op->expmul = 1.0;
821	LOG(llevError,"Fatal: Getting busy object.\n");	636	op->face = blank_face;
822	}	637	op->attacked_by_count = -1;
823	free_objects=op->next;	638
824	if(free_objects!=NULL)
825	free_objects->prev=NULL;
826	op->count= ++ob_count;
827	op->name=NULL;
828	op->name_pl=NULL;
829	op->title=NULL;
830	op->race=NULL;
831	op->slaying=NULL;
832	op->skill = NULL;
833	op->lore=NULL;
834	op->msg=NULL;
835	op->materialname=NULL;
836	op->next=objects;
837	op->prev=NULL;
838	op->active_next = NULL;
839	op->active_prev = NULL;
840	if(objects!=NULL)
841	objects->prev=op;
842	objects=op;
843	clear_object(op);
844	SET_FLAG(op,FLAG_REMOVED);
845	nroffreeobjects--;
846	return op;	639	return op;
847	}	640	}
848		641
849	/*	642	/*
850	* If an object with the IS_TURNABLE() flag needs to be turned due	643	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
852	* be called to update the face variable, _and_ how it looks on the map.	645	* be called to update the face variable, _and_ how it looks on the map.
853	*/	646	*/
854		647
855	void update_turn_face(object *op) {	648	void update_turn_face(object *op) {
856	if(!QUERY_FLAG(op,FLAG_IS_TURNABLE)||op->arch==NULL)	649	if(!QUERY_FLAG(op,FLAG_IS_TURNABLE)||op->arch==NULL)
857	return;	650	return;
858	SET_ANIMATION(op, op->direction);	651	SET_ANIMATION(op, op->direction);
859	update_object(op,UP_OBJ_FACE);	652	update_object(op,UP_OBJ_FACE);
860	}	653	}
861		654
862	/*	655	/*
…		…
871	/* No reason putting the archetypes objects on the speed list,	664	/* No reason putting the archetypes objects on the speed list,
872	* since they never really need to be updated.	665	* since they never really need to be updated.
873	*/	666	*/
874		667
875	if (QUERY_FLAG(op, FLAG_FREED) && op->speed) {	668	if (QUERY_FLAG(op, FLAG_FREED) && op->speed) {
876	LOG(llevError,"Object %s is freed but has speed.\n", op->name);	669	LOG(llevError,"Object %s is freed but has speed.\n", &op->name);
877	#ifdef MANY_CORES	670	#ifdef MANY_CORES
878	abort();	671	abort();
879	#else	672	#else
880	op->speed = 0;	673	op->speed = 0;
881	#endif	674	#endif
882	}	675	}
883	if (arch_init) {	676	if (arch_init) {
884	return;	677	return;
885	}	678	}
886	if (FABS(op->speed)>MIN_ACTIVE_SPEED) {	679	if (FABS(op->speed)>MIN_ACTIVE_SPEED) {
887	/* If already on active list, don't do anything */	680	/* If already on active list, don't do anything */
888	if (op->active_next || op->active_prev || op==active_objects)	681	if (op->active_next || op->active_prev || op==active_objects)
889	return;	682	return;
890		683
891	/* process_events() expects us to insert the object at the beginning	684	/* process_events() expects us to insert the object at the beginning
892	* of the list. */	685	* of the list. */
893	op->active_next = active_objects;	686	op->active_next = active_objects;
894	if (op->active_next!=NULL)	687	if (op->active_next!=NULL)
895	op->active_next->active_prev = op;	688	op->active_next->active_prev = op;
896	active_objects = op;	689	active_objects = op;
897	}	690	}
898	else {	691	else {
899	/* If not on the active list, nothing needs to be done */	692	/* If not on the active list, nothing needs to be done */
900	if (!op->active_next && !op->active_prev && op!=active_objects)	693	if (!op->active_next && !op->active_prev && op!=active_objects)
901	return;	694	return;
902		695
903	if (op->active_prev==NULL) {	696	if (op->active_prev==NULL) {
904	active_objects = op->active_next;	697	active_objects = op->active_next;
905	if (op->active_next!=NULL)	698	if (op->active_next!=NULL)
906	op->active_next->active_prev = NULL;	699	op->active_next->active_prev = NULL;
907	}	700	}
908	else {	701	else {
909	op->active_prev->active_next = op->active_next;	702	op->active_prev->active_next = op->active_next;
910	if (op->active_next)	703	if (op->active_next)
911	op->active_next->active_prev = op->active_prev;	704	op->active_next->active_prev = op->active_prev;
912	}	705	}
913	op->active_next = NULL;	706	op->active_next = NULL;
914	op->active_prev = NULL;	707	op->active_prev = NULL;
915	}	708	}
916	}	709	}
917		710
918	/* This function removes object 'op' from the list of active	711	/* This function removes object 'op' from the list of active
919	* objects.	712	* objects.
…		…
925	*/	718	*/
926	void remove_from_active_list(object *op)	719	void remove_from_active_list(object *op)
927	{	720	{
928	/* If not on the active list, nothing needs to be done */	721	/* If not on the active list, nothing needs to be done */
929	if (!op->active_next && !op->active_prev && op!=active_objects)	722	if (!op->active_next && !op->active_prev && op!=active_objects)
930	return;	723	return;
931		724
932	if (op->active_prev==NULL) {	725	if (op->active_prev==NULL) {
933	active_objects = op->active_next;	726	active_objects = op->active_next;
934	if (op->active_next!=NULL)	727	if (op->active_next!=NULL)
935	op->active_next->active_prev = NULL;	728	op->active_next->active_prev = NULL;
936	}	729	}
937	else {	730	else {
938	op->active_prev->active_next = op->active_next;	731	op->active_prev->active_next = op->active_next;
939	if (op->active_next)	732	if (op->active_next)
940	op->active_next->active_prev = op->active_prev;	733	op->active_next->active_prev = op->active_prev;
941	}	734	}
942	op->active_next = NULL;	735	op->active_next = NULL;
943	op->active_prev = NULL;	736	op->active_prev = NULL;
944	}	737	}
945		738
…		…
965	* UP_OBJ_FACE: only the objects face has changed.	758	* UP_OBJ_FACE: only the objects face has changed.
966	*/	759	*/
967		760
968	void update_object(object *op, int action) {	761	void update_object(object *op, int action) {
969	int update_now=0, flags;	762	int update_now=0, flags;
970	MoveType move_on, move_off, move_block, move_slow;	763	MoveType move_on, move_off, move_block, move_slow;
971		764
972	if (op == NULL) {	765	if (op == NULL) {
973	/* this should never happen */	766	/* this should never happen */
974	LOG(llevDebug,"update_object() called for NULL object.\n");	767	LOG(llevDebug,"update_object() called for NULL object.\n");
975	return;	768	return;
976	}	769	}
977		770
978	if(op->env!=NULL) {	771	if(op->env!=NULL) {
979	/* Animation is currently handled by client, so nothing	772	/* Animation is currently handled by client, so nothing
980	* to do in this case.	773	* to do in this case.
981	*/	774	*/
982	return;	775	return;
983	}	776	}
984		777
985	/* If the map is saving, don't do anything as everything is	778	/* If the map is saving, don't do anything as everything is
986	* going to get freed anyways.	779	* going to get freed anyways.
987	*/	780	*/
988	if (!op->map || op->map->in_memory == MAP_SAVING) return;	781	if (!op->map || op->map->in_memory == MAP_SAVING) return;
989		782
990	/* make sure the object is within map boundaries */	783	/* make sure the object is within map boundaries */
991	if (op->x < 0 || op->x >= MAP_WIDTH(op->map) ||	784	if (op->x < 0 || op->x >= MAP_WIDTH(op->map) ||
992	op->y < 0 || op->y >= MAP_HEIGHT(op->map)) {	785	op->y < 0 || op->y >= MAP_HEIGHT(op->map)) {
993	LOG(llevError,"update_object() called for object out of map!\n");	786	LOG(llevError,"update_object() called for object out of map!\n");
994	#ifdef MANY_CORES	787	#ifdef MANY_CORES
995	abort();	788	abort();
996	#endif	789	#endif
997	return;	790	return;
998	}	791	}
999		792
1000	flags = GET_MAP_FLAGS(op->map, op->x, op->y);	793	flags = GET_MAP_FLAGS(op->map, op->x, op->y);
1001	SET_MAP_FLAGS(op->map, op->x, op->y, flags | P_NEED_UPDATE);	794	SET_MAP_FLAGS(op->map, op->x, op->y, flags | P_NEED_UPDATE);
1002	move_slow = GET_MAP_MOVE_SLOW(op->map, op->x, op->y);	795	move_slow = GET_MAP_MOVE_SLOW(op->map, op->x, op->y);
…		…
1015	update_now=1;	808	update_now=1;
1016		809
1017	if (QUERY_FLAG(op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))	810	if (QUERY_FLAG(op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
1018	update_now=1;	811	update_now=1;
1019		812
1020	if ((move_on | op->move_on) != move_on) update_now=1;	813	if ((move_on | op->move_on) != move_on) update_now=1;
1021	if ((move_off | op->move_off) != move_off) update_now=1;	814	if ((move_off | op->move_off) != move_off) update_now=1;
1022	/* This isn't perfect, but I don't expect a lot of objects to	815	/* This isn't perfect, but I don't expect a lot of objects to
1023	* to have move_allow right now.	816	* to have move_allow right now.
1024	*/	817	*/
1025	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	818	if (((move_block | op->move_block) & ~op->move_allow) != move_block)
1026	update_now=1;	819	update_now=1;
1027	if ((move_slow | op->move_slow) != move_slow) update_now=1;	820	if ((move_slow | op->move_slow) != move_slow) update_now=1;
1028	}	821	}
1029	/* if the object is being removed, we can't make intelligent	822	/* if the object is being removed, we can't make intelligent
1030	* decisions, because remove_ob can't really pass the object	823	* decisions, because remove_ob can't really pass the object
1031	* that is being removed.	824	* that is being removed.
1032	*/	825	*/
1033	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) {	826	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) {
1034	update_now=1;	827	update_now=1;
1035	} else if (action == UP_OBJ_FACE) {	828	} else if (action == UP_OBJ_FACE) {
1036	/* Nothing to do for that case */	829	/* Nothing to do for that case */
1037	}	830	}
1038	else {	831	else {
1039	LOG(llevError,"update_object called with invalid action: %d\n", action);	832	LOG(llevError,"update_object called with invalid action: %d\n", action);
1040	}	833	}
1041		834
1042	if (update_now) {	835	if (update_now) {
1043	SET_MAP_FLAGS(op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);	836	SET_MAP_FLAGS(op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
1044	update_position(op->map, op->x, op->y);	837	update_position(op->map, op->x, op->y);
1045	}	838	}
1046		839
1047	if(op->more!=NULL)	840	if(op->more!=NULL)
1048	update_object(op->more, action);	841	update_object(op->more, action);
1049	}	842	}
1050		843
1051		844
1052	/*	845	/*
1053	* free_object() frees everything allocated by an object, removes	846	* free_object() frees everything allocated by an object, removes
…		…
1058	*	851	*
1059	* If free_inventory is set, free inventory as well. Else drop items in	852	* If free_inventory is set, free inventory as well. Else drop items in
1060	* inventory to the ground.	853	* inventory to the ground.
1061	*/	854	*/
1062		855
		856	void
1063	void free_object(object *ob) {	857	free_object (object * ob)
		858	{
1064	free_object2(ob, 0);	859	free_object2 (ob, 0);
1065	}	860	}
		861
		862	void
1066	void free_object2(object *ob, int free_inventory) {	863	free_object2 (object * ob, int free_inventory)
		864	{
1067	object *tmp,*op;	865	object *tmp, *op;
1068		866
1069	ob->clear ();
1070
1071	if (!QUERY_FLAG(ob,FLAG_REMOVED)) {	867	if (!QUERY_FLAG (ob, FLAG_REMOVED))
		868	{
1072	LOG(llevDebug,"Free object called with non removed object\n");	869	LOG (llevDebug, "Free object called with non removed object\n");
1073	dump_object(ob);	870	dump_object (ob);
1074	#ifdef MANY_CORES	871	#ifdef MANY_CORES
1075	abort();	872	abort ();
1076	#endif	873	#endif
1077	}	874	}
		875
1078	if(QUERY_FLAG(ob,FLAG_FRIENDLY)) {	876	if (QUERY_FLAG (ob, FLAG_FRIENDLY))
		877	{
1079	LOG(llevMonster,"Warning: tried to free friendly object.\n");	878	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1080	remove_friendly_object(ob);	879	remove_friendly_object (ob);
1081	}	880	}
		881
1082	if(QUERY_FLAG(ob,FLAG_FREED)) {	882	if (QUERY_FLAG (ob, FLAG_FREED))
		883	{
1083	dump_object(ob);	884	dump_object (ob);
1084	LOG(llevError,"Trying to free freed object.\n%s\n",errmsg);	885	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1085	return;	886	return;
1086	}	887	}
		888
1087	if(ob->more!=NULL) {	889	if (ob->more != NULL)
		890	{
1088	free_object2(ob->more, free_inventory);	891	free_object2 (ob->more, free_inventory);
1089	ob->more=NULL;	892	ob->more = NULL;
1090	}	893	}
		894
1091	if (ob->inv) {	895	if (ob->inv)
		896	{
1092	/* Only if the space blocks everything do we not process -	897	/* Only if the space blocks everything do we not process -
1093	* if some form of movemnt is allowed, let objects	898	* if some form of movemnt is allowed, let objects
1094	* drop on that space.	899	* drop on that space.
1095	*/	900	*/
1096	if (free_inventory || ob->map==NULL || ob->map->in_memory!=MAP_IN_MEMORY ||	901	if (free_inventory || ob->map == NULL
		902	|| ob->map->in_memory != MAP_IN_MEMORY
1097	(GET_MAP_MOVE_BLOCK(ob->map, ob->x, ob->y) == MOVE_ALL))	903	|| (GET_MAP_MOVE_BLOCK (ob->map, ob->x, ob->y) == MOVE_ALL))
1098	{	904	{
1099	op=ob->inv;	905	op = ob->inv;
		906
1100	while(op!=NULL) {	907	while (op != NULL)
		908	{
1101	tmp=op->below;	909	tmp = op->below;
1102	remove_ob(op);	910	remove_ob (op);
1103	free_object2(op, free_inventory);	911	free_object2 (op, free_inventory);
1104	op=tmp;	912	op = tmp;
1105	}	913	}
1106	}	914	}
		915	else
1107	else { /* Put objects in inventory onto this space */	916	{ /* Put objects in inventory onto this space */
1108	op=ob->inv;	917	op = ob->inv;
		918
1109	while(op!=NULL) {	919	while (op != NULL)
		920	{
1110	tmp=op->below;	921	tmp = op->below;
1111	remove_ob(op);	922	remove_ob (op);
1112	if(QUERY_FLAG(op,FLAG_STARTEQUIP)||QUERY_FLAG(op,FLAG_NO_DROP) ||	923
		924	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
		925	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE
1113	op->type==RUNE || op->type==TRAP || QUERY_FLAG(op,FLAG_IS_A_TEMPLATE))	926	|| op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1114	free_object(op);	927	free_object (op);
1115	else {	928	else
		929	{
1116	op->x=ob->x;	930	op->x = ob->x;
1117	op->y=ob->y;	931	op->y = ob->y;
1118	insert_ob_in_map(op,ob->map,NULL,0); /* Insert in same map as the envir */	932	insert_ob_in_map (op, ob->map, NULL, 0); /* Insert in same map as the envir */
1119	}	933	}
1120	op=tmp;	934
		935	op = tmp;
1121	}	936	}
1122	}	937	}
1123	}	938	}
		939
1124	/* Remove object from the active list */	940	/* Remove object from the active list */
1125	ob->speed = 0;	941	ob->speed = 0;
1126	update_ob_speed(ob);	942	update_ob_speed (ob);
1127		943
1128	SET_FLAG(ob, FLAG_FREED);	944	SET_FLAG (ob, FLAG_FREED);
1129	ob->count = 0;	945	ob->count = 0;
1130		946
1131	/* Remove this object from the list of used objects */	947	/* Remove this object from the list of used objects */
1132	if(ob->prev==NULL) {	948	if (ob->prev == NULL)
		949	{
1133	objects=ob->next;	950	objects = ob->next;
		951
1134	if(objects!=NULL)	952	if (objects != NULL)
1135	objects->prev=NULL;	953	objects->prev = NULL;
		954	}
		955	else
1136	}	956	{
1137	else {
1138	ob->prev->next=ob->next;	957	ob->prev->next = ob->next;
		958
1139	if(ob->next!=NULL)	959	if (ob->next != NULL)
1140	ob->next->prev=ob->prev;	960	ob->next->prev = ob->prev;
1141	}
1142
1143	if(ob->name!=NULL) FREE_AND_CLEAR_STR(ob->name);
1144	if(ob->name_pl!=NULL) FREE_AND_CLEAR_STR(ob->name_pl);
1145	if(ob->title!=NULL) FREE_AND_CLEAR_STR(ob->title);
1146	if(ob->race!=NULL) FREE_AND_CLEAR_STR(ob->race);
1147	if(ob->slaying!=NULL) FREE_AND_CLEAR_STR(ob->slaying);
1148	if(ob->skill!=NULL) FREE_AND_CLEAR_STR(ob->skill);
1149	if(ob->lore!=NULL) FREE_AND_CLEAR_STR(ob->lore);
1150	if(ob->msg!=NULL) FREE_AND_CLEAR_STR(ob->msg);
1151	if(ob->materialname!=NULL) FREE_AND_CLEAR_STR(ob->materialname);
1152
1153		961	}
1154	/* Why aren't events freed? */	962
1155	free_key_values(ob);	963	free_key_values (ob);
1156		964
1157	#if 0 /* MEMORY_DEBUG*/
1158	/* This is a nice idea. Unfortunately, a lot of the code in crossfire
1159	* presumes the freed_object will stick around for at least a little
1160	* bit
1161	*/
1162	/* this is necessary so that memory debugging programs will
1163	* be able to accurately report source of malloc. If we recycle
1164	* objects, then some other area may be doing the get_object
1165	* and not freeing it, but the original one that malloc'd the
1166	* object will get the blame.
1167	*/
1168	free(ob);
1169	#else
1170
1171	/* Now link it with the free_objects list: */	965	/* Now link it with the free_objects list: */
1172	ob->prev=NULL;	966	ob->prev = 0;
1173	ob->next=free_objects;	967	ob->next = 0;
1174	if(free_objects!=NULL)
1175	free_objects->prev=ob;
1176	free_objects=ob;
1177	nroffreeobjects++;
1178	#endif
1179	}
1180		968
1181	/*	969	delete ob;
1182	* count_free() returns the number of objects on the list of free objects.
1183	*/
1184
1185	int count_free(void) {
1186	int i=0;
1187	object *tmp=free_objects;
1188	while(tmp!=NULL)
1189	tmp=tmp->next, i++;
1190	return i;
1191	}
1192
1193	/*
1194	* count_used() returns the number of objects on the list of used objects.
1195	*/
1196
1197	int count_used(void) {
1198	int i=0;
1199	object *tmp=objects;
1200	while(tmp!=NULL)
1201	tmp=tmp->next, i++;
1202	return i;
1203	}
1204
1205	/*
1206	* count_active() returns the number of objects on the list of active objects.
1207	*/
1208
1209	int count_active(void) {
1210	int i=0;
1211	object *tmp=active_objects;
1212	while(tmp!=NULL)
1213	tmp=tmp->active_next, i++;
1214	return i;
1215	}	970	}
1216		971
1217	/*	972	/*
1218	* sub_weight() recursively (outwards) subtracts a number from the	973	* sub_weight() recursively (outwards) subtracts a number from the
1219	* weight of an object (and what is carried by it's environment(s)).	974	* weight of an object (and what is carried by it's environment(s)).
…		…
1246	mapstruct *m;	1001	mapstruct *m;
1247	sint16 x,y;	1002	sint16 x,y;
1248		1003
1249		1004
1250	if(QUERY_FLAG(op,FLAG_REMOVED)) {	1005	if(QUERY_FLAG(op,FLAG_REMOVED)) {
1251	dump_object(op);	1006	dump_object(op);
1252	LOG(llevError,"Trying to remove removed object.\n%s\n",errmsg);	1007	LOG(llevError,"Trying to remove removed object.\n%s\n",errmsg);
1253		1008
1254	/* Changed it to always dump core in this case. As has been learned	1009	/* Changed it to always dump core in this case. As has been learned
1255	* in the past, trying to recover from errors almost always	1010	* in the past, trying to recover from errors almost always
1256	* make things worse, and this is a real error here - something	1011	* make things worse, and this is a real error here - something
1257	* that should not happen.	1012	* that should not happen.
1258	* Yes, if this was a mission critical app, trying to do something	1013	* Yes, if this was a mission critical app, trying to do something
1259	* to recover may make sense, but that is because failure of the app	1014	* to recover may make sense, but that is because failure of the app
1260	* may have other disastrous problems. Cf runs out of a script	1015	* may have other disastrous problems. Cf runs out of a script
1261	* so is easily enough restarted without any real problems.	1016	* so is easily enough restarted without any real problems.
1262	* MSW 2001-07-01	1017	* MSW 2001-07-01
1263	*/	1018	*/
1264	abort();	1019	abort();
1265	}	1020	}
1266	if(op->more!=NULL)	1021	if(op->more!=NULL)
1267	remove_ob(op->more);	1022	remove_ob(op->more);
1268		1023
1269	SET_FLAG(op, FLAG_REMOVED);	1024	SET_FLAG(op, FLAG_REMOVED);
1270		1025
1271	/*	1026	/*
1272	* In this case, the object to be removed is in someones	1027	* In this case, the object to be removed is in someones
1273	* inventory.	1028	* inventory.
1274	*/	1029	*/
1275	if(op->env!=NULL) {	1030	if(op->env!=NULL) {
1276	if(op->nrof)	1031	if(op->nrof)
1277	sub_weight(op->env, op->weight*op->nrof);	1032	sub_weight(op->env, op->weight*op->nrof);
1278	else	1033	else
1279	sub_weight(op->env, op->weight+op->carrying);	1034	sub_weight(op->env, op->weight+op->carrying);
1280		1035
1281	/* NO_FIX_PLAYER is set when a great many changes are being	1036	/* NO_FIX_PLAYER is set when a great many changes are being
1282	* made to players inventory. If set, avoiding the call	1037	* made to players inventory. If set, avoiding the call
1283	* to save cpu time.	1038	* to save cpu time.
1284	*/	1039	*/
1285	if ((otmp=is_player_inv(op->env))!=NULL && otmp->contr &&	1040	if ((otmp=is_player_inv(op->env))!=NULL && otmp->contr &&
1286	!QUERY_FLAG(otmp,FLAG_NO_FIX_PLAYER))	1041	!QUERY_FLAG(otmp,FLAG_NO_FIX_PLAYER))
1287	fix_player(otmp);	1042	fix_player(otmp);
1288		1043
1289	if(op->above!=NULL)	1044	if(op->above!=NULL)
1290	op->above->below=op->below;	1045	op->above->below=op->below;
1291	else	1046	else
1292	op->env->inv=op->below;	1047	op->env->inv=op->below;
1293		1048
1294	if(op->below!=NULL)	1049	if(op->below!=NULL)
1295	op->below->above=op->above;	1050	op->below->above=op->above;
1296		1051
1297	/* we set up values so that it could be inserted into	1052	/* we set up values so that it could be inserted into
1298	* the map, but we don't actually do that - it is up	1053	* the map, but we don't actually do that - it is up
1299	* to the caller to decide what we want to do.	1054	* to the caller to decide what we want to do.
1300	*/	1055	*/
1301	op->x=op->env->x,op->y=op->env->y;	1056	op->x=op->env->x,op->y=op->env->y;
1302	op->ox=op->x,op->oy=op->y;
1303	op->map=op->env->map;	1057	op->map=op->env->map;
1304	op->above=NULL,op->below=NULL;	1058	op->above=NULL,op->below=NULL;
1305	op->env=NULL;	1059	op->env=NULL;
1306	return;	1060	return;
1307	}	1061	}
1308		1062
1309	/* If we get here, we are removing it from a map */	1063	/* If we get here, we are removing it from a map */
1310	if (op->map == NULL) return;	1064	if (op->map == NULL) return;
1311		1065
1312	x = op->x;	1066	x = op->x;
1313	y = op->y;	1067	y = op->y;
1314	m = get_map_from_coord(op->map, &x, &y);	1068	m = get_map_from_coord(op->map, &x, &y);
1315		1069
1316	if (!m) {	1070	if (!m) {
1317	LOG(llevError,"remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1071	LOG(llevError,"remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1318	op->map->path, op->x, op->y);	1072	op->map->path, op->x, op->y);
1319	/* in old days, we used to set x and y to 0 and continue.	1073	/* in old days, we used to set x and y to 0 and continue.
1320	* it seems if we get into this case, something is probablye	1074	* it seems if we get into this case, something is probablye
1321	* screwed up and should be fixed.	1075	* screwed up and should be fixed.
1322	*/	1076	*/
1323	abort();	1077	abort();
1324	}	1078	}
1325	if (op->map != m) {	1079	if (op->map != m) {
1326	LOG(llevDebug,"remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",	1080	LOG(llevDebug,"remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1327	op->map->path, m->path, op->x, op->y, x, y);	1081	op->map->path, m->path, op->x, op->y, x, y);
1328	}	1082	}
1329		1083
1330	/* Re did the following section of code - it looks like it had	1084	/* Re did the following section of code - it looks like it had
1331	* lots of logic for things we no longer care about	1085	* lots of logic for things we no longer care about
1332	*/	1086	*/
1333		1087
1334	/* link the object above us */	1088	/* link the object above us */
1335	if (op->above)	1089	if (op->above)
1336	op->above->below=op->below;	1090	op->above->below=op->below;
1337	else	1091	else
1338	SET_MAP_TOP(m,x,y,op->below); /* we were top, set new top */	1092	SET_MAP_TOP(m,x,y,op->below); /* we were top, set new top */
1339		1093
1340	/* Relink the object below us, if there is one */	1094	/* Relink the object below us, if there is one */
1341	if(op->below) {	1095	if(op->below) {
1342	op->below->above=op->above;	1096	op->below->above=op->above;
1343	} else {	1097	} else {
1344	/* Nothing below, which means we need to relink map object for this space	1098	/* Nothing below, which means we need to relink map object for this space
1345	* use translated coordinates in case some oddness with map tiling is	1099	* use translated coordinates in case some oddness with map tiling is
1346	* evident	1100	* evident
1347	*/	1101	*/
1348	if(GET_MAP_OB(m,x,y)!=op) {	1102	if(GET_MAP_OB(m,x,y)!=op) {
1349	dump_object(op);	1103	dump_object(op);
1350	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", errmsg);	1104	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", errmsg);
1351	dump_object(GET_MAP_OB(m,x,y));	1105	dump_object(GET_MAP_OB(m,x,y));
1352	LOG(llevError,"%s\n",errmsg);	1106	LOG(llevError,"%s\n",errmsg);
1353	}	1107	}
1354	SET_MAP_OB(m,x,y,op->above); /* goes on above it. */	1108	SET_MAP_OB(m,x,y,op->above); /* goes on above it. */
1355	}	1109	}
1356	op->above=NULL;	1110	op->above=NULL;
1357	op->below=NULL;	1111	op->below=NULL;
1358		1112
1359	if (op->map->in_memory == MAP_SAVING)	1113	if (op->map->in_memory == MAP_SAVING)
1360	return;	1114	return;
1361		1115
1362	tag = op->count;	1116	tag = op->count;
1363	check_walk_off = ! QUERY_FLAG (op, FLAG_NO_APPLY);	1117	check_walk_off = ! QUERY_FLAG (op, FLAG_NO_APPLY);
1364	for(tmp=GET_MAP_OB(m,x,y);tmp!=NULL;tmp=tmp->above) {	1118	for(tmp=GET_MAP_OB(m,x,y);tmp!=NULL;tmp=tmp->above) {
1365	/* No point updating the players look faces if he is the object	1119	/* No point updating the players look faces if he is the object
1366	* being removed.	1120	* being removed.
1367	*/	1121	*/
1368		1122
1369	if(tmp->type==PLAYER && tmp!=op) {	1123	if(tmp->type==PLAYER && tmp!=op) {
1370	/* If a container that the player is currently using somehow gets	1124	/* If a container that the player is currently using somehow gets
1371	* removed (most likely destroyed), update the player view	1125	* removed (most likely destroyed), update the player view
1372	* appropriately.	1126	* appropriately.
1373	*/	1127	*/
1374	if (tmp->container==op) {	1128	if (tmp->container==op) {
1375	CLEAR_FLAG(op, FLAG_APPLIED);	1129	CLEAR_FLAG(op, FLAG_APPLIED);
1376	tmp->container=NULL;	1130	tmp->container=NULL;
1377	}	1131	}
1378	tmp->contr->socket.update_look=1;	1132	tmp->contr->socket.update_look=1;
1379	}	1133	}
1380	/* See if player moving off should effect something */	1134	/* See if player moving off should effect something */
1381	if (check_walk_off && ((op->move_type & tmp->move_off) &&	1135	if (check_walk_off && ((op->move_type & tmp->move_off) &&
1382	(op->move_type & ~tmp->move_off & ~tmp->move_block)==0)) {	1136	(op->move_type & ~tmp->move_off & ~tmp->move_block)==0)) {
1383		1137
1384	move_apply(tmp, op, NULL);	1138	move_apply(tmp, op, NULL);
1385	if (was_destroyed (op, tag)) {	1139	if (was_destroyed (op, tag)) {
1386	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed "	1140	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed "
1387	"leaving object\n", tmp->name, tmp->arch->name);	1141	"leaving object\n", &tmp->name, &tmp->arch->name);
1388	}	1142	}
1389	}	1143	}
1390		1144
1391	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1145	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1392		1146
1393	if(tmp->above == tmp)	1147	if(tmp->above == tmp)
1394	tmp->above = NULL;	1148	tmp->above = NULL;
1395	last=tmp;	1149	last=tmp;
1396	}	1150	}
1397	/* last == NULL of there are no objects on this space */	1151	/* last == NULL of there are no objects on this space */
1398	if (last==NULL) {	1152	if (last==NULL) {
1399	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1153	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1400	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1154	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1401	* those out anyways, and if there are any flags set right now, they won't	1155	* those out anyways, and if there are any flags set right now, they won't
1402	* be correct anyways.	1156	* be correct anyways.
1403	*/	1157	*/
1404	SET_MAP_FLAGS(op->map, op->x, op->y, P_NEED_UPDATE);	1158	SET_MAP_FLAGS(op->map, op->x, op->y, P_NEED_UPDATE);
1405	update_position(op->map, op->x, op->y);	1159	update_position(op->map, op->x, op->y);
1406	}	1160	}
1407	else	1161	else
1408	update_object(last, UP_OBJ_REMOVE);	1162	update_object(last, UP_OBJ_REMOVE);
1409		1163
1410	if(QUERY_FLAG(op,FLAG_BLOCKSVIEW)|| (op->glow_radius != 0))	1164	if(QUERY_FLAG(op,FLAG_BLOCKSVIEW)|| (op->glow_radius != 0))
1411	update_all_los(op->map, op->x, op->y);	1165	update_all_los(op->map, op->x, op->y);
1412		1166
1413	}	1167	}
1414		1168
1415	/*	1169	/*
1416	* merge_ob(op,top):	1170	* merge_ob(op,top):
…		…
1482	{	1236	{
1483	object *tmp, *top, *floor=NULL;	1237	object *tmp, *top, *floor=NULL;
1484	sint16 x,y;	1238	sint16 x,y;
1485		1239
1486	if (QUERY_FLAG (op, FLAG_FREED)) {	1240	if (QUERY_FLAG (op, FLAG_FREED)) {
1487	LOG (llevError, "Trying to insert freed object!\n");	1241	LOG (llevError, "Trying to insert freed object!\n");
1488	return NULL;	1242	return NULL;
1489	}	1243	}
1490	if(m==NULL) {	1244	if(m==NULL) {
1491	dump_object(op);	1245	dump_object(op);
1492	LOG(llevError,"Trying to insert in null-map!\n%s\n",errmsg);	1246	LOG(llevError,"Trying to insert in null-map!\n%s\n",errmsg);
1493	return op;	1247	return op;
1494	}	1248	}
1495	if(out_of_map(m,op->x,op->y)) {	1249	if(out_of_map(m,op->x,op->y)) {
1496	dump_object(op);	1250	dump_object(op);
1497	LOG(llevError,"Trying to insert object outside the map.\n%s\n", errmsg);	1251	LOG(llevError,"Trying to insert object outside the map.\n%s\n", errmsg);
1498	#ifdef MANY_CORES	1252	#ifdef MANY_CORES
1499	/* Better to catch this here, as otherwise the next use of this object	1253	/* Better to catch this here, as otherwise the next use of this object
1500	* is likely to cause a crash. Better to find out where it is getting	1254	* is likely to cause a crash. Better to find out where it is getting
1501	* improperly inserted.	1255	* improperly inserted.
1502	*/	1256	*/
1503	abort();	1257	abort();
1504	#endif	1258	#endif
1505	return op;	1259	return op;
1506	}	1260	}
1507	if(!QUERY_FLAG(op,FLAG_REMOVED)) {	1261	if(!QUERY_FLAG(op,FLAG_REMOVED)) {
1508	dump_object(op);	1262	dump_object(op);
1509	LOG(llevError,"Trying to insert (map) inserted object.\n%s\n", errmsg);	1263	LOG(llevError,"Trying to insert (map) inserted object.\n%s\n", errmsg);
1510	return op;	1264	return op;
1511	}	1265	}
1512	if(op->more!=NULL) {	1266	if(op->more!=NULL) {
1513	/* The part may be on a different map. */	1267	/* The part may be on a different map. */
1514		1268
1515	object *more = op->more;	1269	object *more = op->more;
1516		1270
1517	/* We really need the caller to normalize coordinates - if	1271	/* We really need the caller to normalize coordinates - if
1518	* we set the map, that doesn't work if the location is within	1272	* we set the map, that doesn't work if the location is within
1519	* a map and this is straddling an edge. So only if coordinate	1273	* a map and this is straddling an edge. So only if coordinate
1520	* is clear wrong do we normalize it.	1274	* is clear wrong do we normalize it.
1521	*/	1275	*/
1522	if (OUT_OF_REAL_MAP(more->map, more->x, more->y)) {	1276	if (OUT_OF_REAL_MAP(more->map, more->x, more->y)) {
1523	/* Debugging information so you can see the last coordinates this object had */
1524	more->ox = more->x;
1525	more->oy = more->y;
1526	more->map = get_map_from_coord(m, &more->x, &more->y);	1277	more->map = get_map_from_coord(m, &more->x, &more->y);
1527	} else if (!more->map) {	1278	} else if (!more->map) {
1528	/* For backwards compatibility - when not dealing with tiled maps,	1279	/* For backwards compatibility - when not dealing with tiled maps,
1529	* more->map should always point to the parent.	1280	* more->map should always point to the parent.
1530	*/	1281	*/
1531	more->map = m;	1282	more->map = m;
1532	}	1283	}
1533		1284
1534	if (insert_ob_in_map(more, more->map, originator, flag) == NULL) {	1285	if (insert_ob_in_map(more, more->map, originator, flag) == NULL) {
1535	if ( ! op->head)	1286	if ( ! op->head)
1536	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1287	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1537	return NULL;	1288	return NULL;
1538	}	1289	}
1539	}	1290	}
1540	CLEAR_FLAG(op,FLAG_REMOVED);	1291	CLEAR_FLAG(op,FLAG_REMOVED);
1541
1542	/* Debugging information so you can see the last coordinates this object had */
1543	op->ox=op->x;
1544	op->oy=op->y;
1545		1292
1546	/* Ideally, the caller figures this out. However, it complicates a lot	1293	/* Ideally, the caller figures this out. However, it complicates a lot
1547	* of areas of callers (eg, anything that uses find_free_spot would now	1294	* of areas of callers (eg, anything that uses find_free_spot would now
1548	* need extra work	1295	* need extra work
1549	*/	1296	*/
…		…
1552	y = op->y;	1299	y = op->y;
1553		1300
1554	/* this has to be done after we translate the coordinates.	1301	/* this has to be done after we translate the coordinates.
1555	*/	1302	*/
1556	if(op->nrof && !(flag & INS_NO_MERGE)) {	1303	if(op->nrof && !(flag & INS_NO_MERGE)) {
1557	for(tmp=GET_MAP_OB(op->map,x,y);tmp!=NULL;tmp=tmp->above)	1304	for(tmp=GET_MAP_OB(op->map,x,y);tmp!=NULL;tmp=tmp->above)
1558	if (CAN_MERGE(op,tmp)) {	1305	if (CAN_MERGE(op,tmp)) {
1559	op->nrof+=tmp->nrof;	1306	op->nrof+=tmp->nrof;
1560	remove_ob(tmp);	1307	remove_ob(tmp);
1561	free_object(tmp);	1308	free_object(tmp);
1562	}	1309	}
1563	}	1310	}
1564		1311
1565	CLEAR_FLAG(op,FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1312	CLEAR_FLAG(op,FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1566	CLEAR_FLAG(op, FLAG_INV_LOCKED);	1313	CLEAR_FLAG(op, FLAG_INV_LOCKED);
1567	if (!QUERY_FLAG(op, FLAG_ALIVE))	1314	if (!QUERY_FLAG(op, FLAG_ALIVE))
1568	CLEAR_FLAG(op, FLAG_NO_STEAL);	1315	CLEAR_FLAG(op, FLAG_NO_STEAL);
1569		1316
1570	if (flag & INS_BELOW_ORIGINATOR) {	1317	if (flag & INS_BELOW_ORIGINATOR) {
1571	if (originator->map != op->map || originator->x != op->x ||	1318	if (originator->map != op->map || originator->x != op->x ||
1572	originator->y != op->y) {	1319	originator->y != op->y) {
1573	LOG(llevError,"insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1320	LOG(llevError,"insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1574	abort();	1321	abort();
1575	}	1322	}
1576	op->above = originator;	1323	op->above = originator;
1577	op->below = originator->below;	1324	op->below = originator->below;
1578	if (op->below) op->below->above = op;	1325	if (op->below) op->below->above = op;
1579	else SET_MAP_OB(op->map, op->x, op->y, op);	1326	else SET_MAP_OB(op->map, op->x, op->y, op);
1580	/* since *below* originator, no need to update top */	1327	/* since *below* originator, no need to update top */
1581	originator->below = op;	1328	originator->below = op;
1582	} else {	1329	} else {
1583	/* If there are other objects, then */	1330	/* If there are other objects, then */
1584	if((! (flag & INS_MAP_LOAD)) && ((top=GET_MAP_OB(op->map,op->x,op->y))!=NULL)) {	1331	if((! (flag & INS_MAP_LOAD)) && ((top=GET_MAP_OB(op->map,op->x,op->y))!=NULL)) {
1585	object *last=NULL;	1332	object *last=NULL;
1586	/*	1333	/*
1587	* If there are multiple objects on this space, we do some trickier handling.	1334	* If there are multiple objects on this space, we do some trickier handling.
1588	* We've already dealt with merging if appropriate.	1335	* We've already dealt with merging if appropriate.
1589	* Generally, we want to put the new object on top. But if	1336	* Generally, we want to put the new object on top. But if
1590	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1337	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1591	* floor, we want to insert above that and no further.	1338	* floor, we want to insert above that and no further.
1592	* Also, if there are spell objects on this space, we stop processing	1339	* Also, if there are spell objects on this space, we stop processing
1593	* once we get to them. This reduces the need to traverse over all of	1340	* once we get to them. This reduces the need to traverse over all of
1594	* them when adding another one - this saves quite a bit of cpu time	1341	* them when adding another one - this saves quite a bit of cpu time
1595	* when lots of spells are cast in one area. Currently, it is presumed	1342	* when lots of spells are cast in one area. Currently, it is presumed
1596	* that flying non pickable objects are spell objects.	1343	* that flying non pickable objects are spell objects.
1597	*/	1344	*/
1598		1345
1599	while (top != NULL) {	1346	while (top != NULL) {
1600	if (QUERY_FLAG(top, FLAG_IS_FLOOR) ||	1347	if (QUERY_FLAG(top, FLAG_IS_FLOOR) ||
1601	QUERY_FLAG(top, FLAG_OVERLAY_FLOOR)) floor = top;	1348	QUERY_FLAG(top, FLAG_OVERLAY_FLOOR)) floor = top;
1602	if (QUERY_FLAG(top, FLAG_NO_PICK)	1349	if (QUERY_FLAG(top, FLAG_NO_PICK)
1603	&& (top->move_type & (MOVE_FLY_LOW |MOVE_FLY_HIGH))	1350	&& (top->move_type & (MOVE_FLY_LOW |MOVE_FLY_HIGH))
1604	&& !QUERY_FLAG(top, FLAG_IS_FLOOR))	1351	&& !QUERY_FLAG(top, FLAG_IS_FLOOR))
1605	{	1352	{
1606	/* We insert above top, so we want this object below this */	1353	/* We insert above top, so we want this object below this */
1607	top=top->below;	1354	top=top->below;
1608	break;	1355	break;
1609	}	1356	}
1610	last = top;	1357	last = top;
1611	top = top->above;	1358	top = top->above;
1612	}	1359	}
1613	/* Don't want top to be NULL, so set it to the last valid object */	1360	/* Don't want top to be NULL, so set it to the last valid object */
1614	top = last;	1361	top = last;
1615		1362
1616	/* We let update_position deal with figuring out what the space	1363	/* We let update_position deal with figuring out what the space
1617	* looks like instead of lots of conditions here.	1364	* looks like instead of lots of conditions here.
1618	* makes things faster, and effectively the same result.	1365	* makes things faster, and effectively the same result.
1619	*/	1366	*/
1620		1367
1621	/* Have object 'fall below' other objects that block view.	1368	/* Have object 'fall below' other objects that block view.
1622	* Unless those objects are exits, type 66	1369	* Unless those objects are exits, type 66
1623	* If INS_ON_TOP is used, don't do this processing	1370	* If INS_ON_TOP is used, don't do this processing
1624	* Need to find the object that in fact blocks view, otherwise	1371	* Need to find the object that in fact blocks view, otherwise
1625	* stacking is a bit odd.	1372	* stacking is a bit odd.
1626	*/	1373	*/
1627	if (!(flag & INS_ON_TOP) &&	1374	if (!(flag & INS_ON_TOP) &&
1628	(get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) &&	1375	(get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) &&
1629	(op->face && !op->face->visibility)) {	1376	(op->face && !op->face->visibility)) {
1630	for (last=top; last != floor; last=last->below)	1377	for (last=top; last != floor; last=last->below)
1631	if (QUERY_FLAG(last, FLAG_BLOCKSVIEW)&&(last->type != EXIT)) break;	1378	if (QUERY_FLAG(last, FLAG_BLOCKSVIEW)&&(last->type != EXIT)) break;
1632	/* Check to see if we found the object that blocks view,	1379	/* Check to see if we found the object that blocks view,
1633	* and make sure we have a below pointer for it so that	1380	* and make sure we have a below pointer for it so that
1634	* we can get inserted below this one, which requires we	1381	* we can get inserted below this one, which requires we
1635	* set top to the object below us.	1382	* set top to the object below us.
1636	*/	1383	*/
1637	if (last && last->below && last != floor) top=last->below;	1384	if (last && last->below && last != floor) top=last->below;
1638	}	1385	}
1639	} /* If objects on this space */	1386	} /* If objects on this space */
1640	if (flag & INS_MAP_LOAD)	1387	if (flag & INS_MAP_LOAD)
1641	top = GET_MAP_TOP(op->map,op->x,op->y);	1388	top = GET_MAP_TOP(op->map,op->x,op->y);
1642	if (flag & INS_ABOVE_FLOOR_ONLY) top = floor;	1389	if (flag & INS_ABOVE_FLOOR_ONLY) top = floor;
1643		1390
1644	/* Top is the object that our object (op) is going to get inserted above.	1391	/* Top is the object that our object (op) is going to get inserted above.
1645	*/	1392	*/
1646		1393
1647	/* First object on this space */	1394	/* First object on this space */
1648	if (!top) {	1395	if (!top) {
1649	op->above = GET_MAP_OB(op->map, op->x, op->y);	1396	op->above = GET_MAP_OB(op->map, op->x, op->y);
1650	if (op->above) op->above->below = op;	1397	if (op->above) op->above->below = op;
1651	op->below = NULL;	1398	op->below = NULL;
1652	SET_MAP_OB(op->map, op->x, op->y, op);	1399	SET_MAP_OB(op->map, op->x, op->y, op);
1653	} else { /* get inserted into the stack above top */	1400	} else { /* get inserted into the stack above top */
1654	op->above = top->above;	1401	op->above = top->above;
1655	if (op->above) op->above->below = op;	1402	if (op->above) op->above->below = op;
1656	op->below = top;	1403	op->below = top;
1657	top->above = op;	1404	top->above = op;
1658	}	1405	}
1659	if (op->above==NULL)	1406	if (op->above==NULL)
1660	SET_MAP_TOP(op->map,op->x, op->y, op);	1407	SET_MAP_TOP(op->map,op->x, op->y, op);
1661	} /* else not INS_BELOW_ORIGINATOR */	1408	} /* else not INS_BELOW_ORIGINATOR */
1662		1409
1663	if(op->type==PLAYER)	1410	if(op->type==PLAYER)
1664	op->contr->do_los=1;	1411	op->contr->do_los=1;
1665		1412
1666	/* If we have a floor, we know the player, if any, will be above	1413	/* If we have a floor, we know the player, if any, will be above
1667	* it, so save a few ticks and start from there.	1414	* it, so save a few ticks and start from there.
1668	*/	1415	*/
1669	if (!(flag & INS_MAP_LOAD))	1416	if (!(flag & INS_MAP_LOAD))
1670	for(tmp=floor?floor:GET_MAP_OB(op->map,op->x,op->y);tmp!=NULL;tmp=tmp->above) {	1417	for(tmp=floor?floor:GET_MAP_OB(op->map,op->x,op->y);tmp!=NULL;tmp=tmp->above) {
1671	if (tmp->type == PLAYER)	1418	if (tmp->type == PLAYER)
1672	tmp->contr->socket.update_look=1;	1419	tmp->contr->socket.update_look=1;
1673	}	1420	}
1674		1421
1675	/* If this object glows, it may affect lighting conditions that are	1422	/* If this object glows, it may affect lighting conditions that are
1676	* visible to others on this map. But update_all_los is really	1423	* visible to others on this map. But update_all_los is really
1677	* an inefficient way to do this, as it means los for all players	1424	* an inefficient way to do this, as it means los for all players
1678	* on the map will get recalculated. The players could very well	1425	* on the map will get recalculated. The players could very well
…		…
1680	* this should get redone to only look for players within range,	1427	* this should get redone to only look for players within range,
1681	* or just updating the P_NEED_UPDATE for spaces within this area	1428	* or just updating the P_NEED_UPDATE for spaces within this area
1682	* of effect may be sufficient.	1429	* of effect may be sufficient.
1683	*/	1430	*/
1684	if(MAP_DARKNESS(op->map) && (op->glow_radius != 0))	1431	if(MAP_DARKNESS(op->map) && (op->glow_radius != 0))
1685	update_all_los(op->map, op->x, op->y);	1432	update_all_los(op->map, op->x, op->y);
1686		1433
1687		1434
1688	/* updates flags (blocked, alive, no magic, etc) for this map space */	1435	/* updates flags (blocked, alive, no magic, etc) for this map space */
1689	update_object(op,UP_OBJ_INSERT);	1436	update_object(op,UP_OBJ_INSERT);
1690		1437
…		…
1700		1447
1701	/* if this is not the head or flag has been passed, don't check walk on status */	1448	/* if this is not the head or flag has been passed, don't check walk on status */
1702		1449
1703	if (!(flag & INS_NO_WALK_ON) && !op->head) {	1450	if (!(flag & INS_NO_WALK_ON) && !op->head) {
1704	if (check_move_on(op, originator))	1451	if (check_move_on(op, originator))
1705	return NULL;	1452	return NULL;
1706		1453
1707	/* If we are a multi part object, lets work our way through the check	1454	/* If we are a multi part object, lets work our way through the check
1708	* walk on's.	1455	* walk on's.
1709	*/	1456	*/
1710	for (tmp=op->more; tmp!=NULL; tmp=tmp->more)	1457	for (tmp=op->more; tmp!=NULL; tmp=tmp->more)
1711	if (check_move_on (tmp, originator))	1458	if (check_move_on (tmp, originator))
1712	return NULL;	1459	return NULL;
1713	}	1460	}
1714	return op;	1461	return op;
1715	}	1462	}
1716		1463
1717	/* this function inserts an object in the map, but if it	1464	/* this function inserts an object in the map, but if it
…		…
1723	object *tmp1;	1470	object *tmp1;
1724		1471
1725	/* first search for itself and remove any old instances */	1472	/* first search for itself and remove any old instances */
1726		1473
1727	for(tmp=GET_MAP_OB(op->map,op->x,op->y); tmp!=NULL; tmp=tmp->above) {	1474	for(tmp=GET_MAP_OB(op->map,op->x,op->y); tmp!=NULL; tmp=tmp->above) {
1728	if(!strcmp(tmp->arch->name,arch_string)) /* same archetype */ {	1475	if(!strcmp(tmp->arch->name,arch_string)) /* same archetype */ {
1729	remove_ob(tmp);	1476	remove_ob(tmp);
1730	free_object(tmp);	1477	free_object(tmp);
1731	}	1478	}
1732	}	1479	}
1733		1480
1734	tmp1=arch_to_object(find_archetype(arch_string));	1481	tmp1=arch_to_object(find_archetype(arch_string));
1735		1482
1736		1483
…		…
1749	object *get_split_ob(object *orig_ob, uint32 nr) {	1496	object *get_split_ob(object *orig_ob, uint32 nr) {
1750	object *newob;	1497	object *newob;
1751	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1498	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1752		1499
1753	if(orig_ob->nrof<nr) {	1500	if(orig_ob->nrof<nr) {
1754	sprintf(errmsg,"There are only %d %ss.",	1501	sprintf(errmsg,"There are only %d %ss.",
1755	orig_ob->nrof?orig_ob->nrof:1, orig_ob->name);	1502	orig_ob->nrof?orig_ob->nrof:1, &orig_ob->name);
1756	return NULL;	1503	return NULL;
1757	}	1504	}
1758	newob = object_create_clone(orig_ob);	1505	newob = object_create_clone(orig_ob);
1759	if((orig_ob->nrof-=nr)<1) {	1506	if((orig_ob->nrof-=nr)<1) {
1760	if ( ! is_removed)	1507	if ( ! is_removed)
1761	remove_ob(orig_ob);	1508	remove_ob(orig_ob);
1762	free_object2(orig_ob, 1);	1509	free_object2(orig_ob, 1);
1763	}	1510	}
1764	else if ( ! is_removed) {	1511	else if ( ! is_removed) {
1765	if(orig_ob->env!=NULL)	1512	if(orig_ob->env!=NULL)
1766	sub_weight (orig_ob->env,orig_ob->weight*nr);	1513	sub_weight (orig_ob->env,orig_ob->weight*nr);
1767	if (orig_ob->env == NULL && orig_ob->map->in_memory!=MAP_IN_MEMORY) {	1514	if (orig_ob->env == NULL && orig_ob->map->in_memory!=MAP_IN_MEMORY) {
1768	strcpy(errmsg, "Tried to split object whose map is not in memory.");	1515	strcpy(errmsg, "Tried to split object whose map is not in memory.");
1769	LOG(llevDebug,	1516	LOG(llevDebug,
1770	"Error, Tried to split object whose map is not in memory.\n");	1517	"Error, Tried to split object whose map is not in memory.\n");
1771	return NULL;	1518	return NULL;
1772	}	1519	}
1773	}	1520	}
1774	newob->nrof=nr;	1521	newob->nrof=nr;
1775		1522
1776	return newob;	1523	return newob;
1777	}	1524	}
…		…
1799	{	1546	{
1800	op->nrof -= i;	1547	op->nrof -= i;
1801	}	1548	}
1802	else if (op->env != NULL)	1549	else if (op->env != NULL)
1803	{	1550	{
1804	/* is this object in the players inventory, or sub container	1551	/* is this object in the players inventory, or sub container
1805	* therein?	1552	* therein?
1806	*/	1553	*/
1807	tmp = is_player_inv (op->env);	1554	tmp = is_player_inv (op->env);
1808	/* nope. Is this a container the player has opened?	1555	/* nope. Is this a container the player has opened?
1809	* If so, set tmp to that player.	1556	* If so, set tmp to that player.
1810	* IMO, searching through all the players will mostly	1557	* IMO, searching through all the players will mostly
1811	* likely be quicker than following op->env to the map,	1558	* likely be quicker than following op->env to the map,
1812	* and then searching the map for a player.	1559	* and then searching the map for a player.
1813	*/	1560	*/
1814	if (!tmp) {	1561	if (!tmp) {
1815	for (pl=first_player; pl; pl=pl->next)	1562	for (pl=first_player; pl; pl=pl->next)
1816	if (pl->ob->container == op->env) break;	1563	if (pl->ob->container == op->env) break;
1817	if (pl) tmp=pl->ob;	1564	if (pl) tmp=pl->ob;
1818	else tmp=NULL;	1565	else tmp=NULL;
1819	}	1566	}
1820		1567
1821	if (i < op->nrof) {	1568	if (i < op->nrof) {
1822	sub_weight (op->env, op->weight * i);	1569	sub_weight (op->env, op->weight * i);
1823	op->nrof -= i;	1570	op->nrof -= i;
1824	if (tmp) {	1571	if (tmp) {
…		…
1832	}	1579	}
1833	}	1580	}
1834	}	1581	}
1835	else	1582	else
1836	{	1583	{
1837	object *above = op->above;	1584	object *above = op->above;
1838		1585
1839	if (i < op->nrof) {	1586	if (i < op->nrof) {
1840	op->nrof -= i;	1587	op->nrof -= i;
1841	} else {	1588	} else {
1842	remove_ob (op);	1589	remove_ob (op);
1843	op->nrof = 0;	1590	op->nrof = 0;
1844	}	1591	}
1845	/* Since we just removed op, op->above is null */	1592	/* Since we just removed op, op->above is null */
1846	for (tmp = above; tmp != NULL; tmp = tmp->above)	1593	for (tmp = above; tmp != NULL; tmp = tmp->above)
1847	if (tmp->type == PLAYER) {	1594	if (tmp->type == PLAYER) {
1848	if (op->nrof)	1595	if (op->nrof)
1849	esrv_send_item(tmp, op);	1596	esrv_send_item(tmp, op);
1850	else	1597	else
…		…
1902	LOG(llevError,"Trying to put object in NULL.\n%s\n", errmsg);	1649	LOG(llevError,"Trying to put object in NULL.\n%s\n", errmsg);
1903	return op;	1650	return op;
1904	}	1651	}
1905	if (where->head) {	1652	if (where->head) {
1906	LOG(llevDebug,	1653	LOG(llevDebug,
1907	"Warning: Tried to insert object wrong part of multipart object.\n");	1654	"Warning: Tried to insert object wrong part of multipart object.\n");
1908	where = where->head;	1655	where = where->head;
1909	}	1656	}
1910	if (op->more) {	1657	if (op->more) {
1911	LOG(llevError, "Tried to insert multipart object %s (%d)\n",	1658	LOG(llevError, "Tried to insert multipart object %s (%d)\n",
1912	op->name, op->count);	1659	&op->name, op->count);
1913	return op;	1660	return op;
1914	}	1661	}
1915	CLEAR_FLAG(op, FLAG_OBJ_ORIGINAL);	1662	CLEAR_FLAG(op, FLAG_OBJ_ORIGINAL);
1916	CLEAR_FLAG(op, FLAG_REMOVED);	1663	CLEAR_FLAG(op, FLAG_REMOVED);
1917	if(op->nrof) {	1664	if(op->nrof) {
1918	for(tmp=where->inv;tmp!=NULL;tmp=tmp->below)	1665	for(tmp=where->inv;tmp!=NULL;tmp=tmp->below)
1919	if ( CAN_MERGE(tmp,op) ) {	1666	if ( CAN_MERGE(tmp,op) ) {
1920	/* return the original object and remove inserted object	1667	/* return the original object and remove inserted object
1921	(client needs the original object) */	1668	(client needs the original object) */
1922	tmp->nrof += op->nrof;	1669	tmp->nrof += op->nrof;
1923	/* Weight handling gets pretty funky. Since we are adding to	1670	/* Weight handling gets pretty funky. Since we are adding to
1924	* tmp->nrof, we need to increase the weight.	1671	* tmp->nrof, we need to increase the weight.
1925	*/	1672	*/
1926	add_weight (where, op->weight*op->nrof);	1673	add_weight (where, op->weight*op->nrof);
1927	SET_FLAG(op, FLAG_REMOVED);	1674	SET_FLAG(op, FLAG_REMOVED);
1928	free_object(op); /* free the inserted object */	1675	free_object(op); /* free the inserted object */
1929	op = tmp;	1676	op = tmp;
1930	remove_ob (op); /* and fix old object's links */	1677	remove_ob (op); /* and fix old object's links */
1931	CLEAR_FLAG(op, FLAG_REMOVED);	1678	CLEAR_FLAG(op, FLAG_REMOVED);
1932	break;	1679	break;
1933	}	1680	}
1934		1681
1935	/* I assume combined objects have no inventory	1682	/* I assume combined objects have no inventory
1936	* We add the weight - this object could have just been removed	1683	* We add the weight - this object could have just been removed
1937	* (if it was possible to merge). calling remove_ob will subtract	1684	* (if it was possible to merge). calling remove_ob will subtract
…		…
1951	op->map=NULL;	1698	op->map=NULL;
1952	op->env=where;	1699	op->env=where;
1953	op->above=NULL;	1700	op->above=NULL;
1954	op->below=NULL;	1701	op->below=NULL;
1955	op->x=0,op->y=0;	1702	op->x=0,op->y=0;
1956	op->ox=0,op->oy=0;
1957		1703
1958	/* reset the light list and los of the players on the map */	1704	/* reset the light list and los of the players on the map */
1959	if((op->glow_radius!=0)&&where->map)	1705	if((op->glow_radius!=0)&&where->map)
1960	{	1706	{
1961	#ifdef DEBUG_LIGHTS	1707	#ifdef DEBUG_LIGHTS
1962	LOG(llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n",	1708	LOG(llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n",
1963	op->name);	1709	op->name);
1964	#endif /* DEBUG_LIGHTS */	1710	#endif /* DEBUG_LIGHTS */
1965	if (MAP_DARKNESS(where->map)) update_all_los(where->map, where->x, where->y);	1711	if (MAP_DARKNESS(where->map)) update_all_los(where->map, where->x, where->y);
1966	}	1712	}
1967		1713
1968	/* Client has no idea of ordering so lets not bother ordering it here.	1714	/* Client has no idea of ordering so lets not bother ordering it here.
…		…
2003	{	1749	{
2004	object *tmp;	1750	object *tmp;
2005	tag_t tag;	1751	tag_t tag;
2006	mapstruct *m=op->map;	1752	mapstruct *m=op->map;
2007	int x=op->x, y=op->y;	1753	int x=op->x, y=op->y;
2008	MoveType move_on, move_slow, move_block;	1754	MoveType move_on, move_slow, move_block;
2009		1755
2010	if(QUERY_FLAG(op,FLAG_NO_APPLY))	1756	if(QUERY_FLAG(op,FLAG_NO_APPLY))
2011	return 0;	1757	return 0;
2012		1758
2013	tag = op->count;	1759	tag = op->count;
2014		1760
2015	move_on = GET_MAP_MOVE_ON(op->map, op->x, op->y);	1761	move_on = GET_MAP_MOVE_ON(op->map, op->x, op->y);
2016	move_slow = GET_MAP_MOVE_SLOW(op->map, op->x, op->y);	1762	move_slow = GET_MAP_MOVE_SLOW(op->map, op->x, op->y);
…		…
2020	* no need to do checking below. have to make sure move_type	1766	* no need to do checking below. have to make sure move_type
2021	* is set, as lots of objects don't have it set - we treat that	1767	* is set, as lots of objects don't have it set - we treat that
2022	* as walking.	1768	* as walking.
2023	*/	1769	*/
2024	if (op->move_type && !(op->move_type & move_on) && !(op->move_type & move_slow))	1770	if (op->move_type && !(op->move_type & move_on) && !(op->move_type & move_slow))
2025	return 0;	1771	return 0;
2026		1772
2027	/* This is basically inverse logic of that below - basically,	1773	/* This is basically inverse logic of that below - basically,
2028	* if the object can avoid the move on or slow move, they do so,	1774	* if the object can avoid the move on or slow move, they do so,
2029	* but can't do it if the alternate movement they are using is	1775	* but can't do it if the alternate movement they are using is
2030	* blocked. Logic on this seems confusing, but does seem correct.	1776	* blocked. Logic on this seems confusing, but does seem correct.
2031	*/	1777	*/
2032	if ((op->move_type & ~move_on & ~move_block) != 0 &&	1778	if ((op->move_type & ~move_on & ~move_block) != 0 &&
2033	(op->move_type & ~move_slow & ~move_block) != 0) return 0;	1779	(op->move_type & ~move_slow & ~move_block) != 0) return 0;
2034		1780
2035	/* The objects have to be checked from top to bottom.	1781	/* The objects have to be checked from top to bottom.
2036	* Hence, we first go to the top:	1782	* Hence, we first go to the top:
2037	*/	1783	*/
2038		1784
2039	for (tmp=GET_MAP_OB(op->map, op->x, op->y); tmp!=NULL &&	1785	for (tmp=GET_MAP_OB(op->map, op->x, op->y); tmp!=NULL &&
2040	tmp->above!=NULL; tmp=tmp->above) {	1786	tmp->above!=NULL; tmp=tmp->above) {
2041	/* Trim the search when we find the first other spell effect	1787	/* Trim the search when we find the first other spell effect
2042	* this helps performance so that if a space has 50 spell objects,	1788	* this helps performance so that if a space has 50 spell objects,
2043	* we don't need to check all of them.	1789	* we don't need to check all of them.
2044	*/	1790	*/
2045	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG(tmp, FLAG_NO_PICK)) break;	1791	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG(tmp, FLAG_NO_PICK)) break;
2046	}	1792	}
2047	for(;tmp!=NULL; tmp=tmp->below) {	1793	for(;tmp!=NULL; tmp=tmp->below) {
2048	if (tmp == op) continue; /* Can't apply yourself */	1794	if (tmp == op) continue; /* Can't apply yourself */
2049		1795
2050	/* Check to see if one of the movement types should be slowed down.	1796	/* Check to see if one of the movement types should be slowed down.
2051	* Second check makes sure that the movement types not being slowed	1797	* Second check makes sure that the movement types not being slowed
2052	* (~slow_move) is not blocked on this space - just because the	1798	* (~slow_move) is not blocked on this space - just because the
2053	* space doesn't slow down swimming (for example), if you can't actually	1799	* space doesn't slow down swimming (for example), if you can't actually
2054	* swim on that space, can't use it to avoid the penalty.	1800	* swim on that space, can't use it to avoid the penalty.
2055	*/	1801	*/
2056	if (!QUERY_FLAG(op, FLAG_WIZPASS)) {	1802	if (!QUERY_FLAG(op, FLAG_WIZPASS)) {
2057	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1803	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2058	((op->move_type & tmp->move_slow) &&	1804	((op->move_type & tmp->move_slow) &&
2059	(op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) {	1805	(op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) {
2060		1806
2061	float diff;	1807	float diff;
2062		1808
2063	diff = tmp->move_slow_penalty*FABS(op->speed);	1809	diff = tmp->move_slow_penalty*FABS(op->speed);
2064	if (op->type == PLAYER) {	1810	if (op->type == PLAYER) {
2065	if ((QUERY_FLAG(tmp, FLAG_IS_HILLY) && find_skill_by_number(op, SK_CLIMBING)) ||	1811	if ((QUERY_FLAG(tmp, FLAG_IS_HILLY) && find_skill_by_number(op, SK_CLIMBING)) ||
2066	(QUERY_FLAG(tmp, FLAG_IS_WOODED) && find_skill_by_number(op, SK_WOODSMAN))) {	1812	(QUERY_FLAG(tmp, FLAG_IS_WOODED) && find_skill_by_number(op, SK_WOODSMAN))) {
2067	diff /= 4.0;	1813	diff /= 4.0;
2068	}	1814	}
2069	}	1815	}
2070	op->speed_left -= diff;	1816	op->speed_left -= diff;
2071	}	1817	}
2072	}	1818	}
2073		1819
2074	/* Basically same logic as above, except now for actual apply. */	1820	/* Basically same logic as above, except now for actual apply. */
2075	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1821	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2076	((op->move_type & tmp->move_on) &&	1822	((op->move_type & tmp->move_on) &&
2077	(op->move_type & ~tmp->move_on & ~tmp->move_block)==0)) {	1823	(op->move_type & ~tmp->move_on & ~tmp->move_block)==0)) {
2078		1824
2079	move_apply(tmp, op, originator);	1825	move_apply(tmp, op, originator);
2080	if (was_destroyed (op, tag))	1826	if (was_destroyed (op, tag))
2081	return 1;	1827	return 1;
2082		1828
2083	/* what the person/creature stepped onto has moved the object	1829	/* what the person/creature stepped onto has moved the object
2084	* someplace new. Don't process any further - if we did,	1830	* someplace new. Don't process any further - if we did,
2085	* have a feeling strange problems would result.	1831	* have a feeling strange problems would result.
2086	*/	1832	*/
2087	if (op->map != m || op->x != x || op->y != y) return 0;	1833	if (op->map != m || op->x != x || op->y != y) return 0;
2088	}	1834	}
2089	}	1835	}
2090	return 0;	1836	return 0;
2091	}	1837	}
2092		1838
2093	/*	1839	/*
…		…
2157		1903
2158	object *present_in_ob_by_name(int type, const char *str, const object *op) {	1904	object *present_in_ob_by_name(int type, const char *str, const object *op) {
2159	object *tmp;	1905	object *tmp;
2160		1906
2161	for(tmp=op->inv; tmp!=NULL; tmp=tmp->below) {	1907	for(tmp=op->inv; tmp!=NULL; tmp=tmp->below) {
2162	if ((type==-1 || tmp->type==type) && (!strcmp(str, tmp->name)))	1908	if ((type==-1 || tmp->type==type) && (!strcmp(str, tmp->name)))
2163	return tmp;	1909	return tmp;
2164	}	1910	}
2165	return NULL;	1911	return NULL;
2166	}	1912	}
2167		1913
2168	/*	1914	/*
…		…
2238	int find_free_spot(const object *ob, mapstruct *m,int x,int y,int start,int stop) {	1984	int find_free_spot(const object *ob, mapstruct *m,int x,int y,int start,int stop) {
2239	int i,index=0, flag;	1985	int i,index=0, flag;
2240	static int altern[SIZEOFFREE];	1986	static int altern[SIZEOFFREE];
2241		1987
2242	for(i=start;i<stop;i++) {	1988	for(i=start;i<stop;i++) {
2243	flag = ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i]);	1989	flag = ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i]);
2244	if(!flag)	1990	if(!flag)
2245	altern[index++]=i;	1991	altern[index++]=i;
2246		1992
2247	/* Basically, if we find a wall on a space, we cut down the search size.	1993	/* Basically, if we find a wall on a space, we cut down the search size.
2248	* In this way, we won't return spaces that are on another side of a wall.	1994	* In this way, we won't return spaces that are on another side of a wall.
2249	* This mostly work, but it cuts down the search size in all directions -	1995	* This mostly work, but it cuts down the search size in all directions -
2250	* if the space being examined only has a wall to the north and empty	1996	* if the space being examined only has a wall to the north and empty
2251	* spaces in all the other directions, this will reduce the search space	1997	* spaces in all the other directions, this will reduce the search space
2252	* to only the spaces immediately surrounding the target area, and	1998	* to only the spaces immediately surrounding the target area, and
2253	* won't look 2 spaces south of the target space.	1999	* won't look 2 spaces south of the target space.
2254	*/	2000	*/
2255	else if ((flag & AB_NO_PASS) && maxfree[i]<stop)	2001	else if ((flag & AB_NO_PASS) && maxfree[i]<stop)
2256	stop=maxfree[i];	2002	stop=maxfree[i];
2257	}	2003	}
2258	if(!index) return -1;	2004	if(!index) return -1;
2259	return altern[RANDOM()%index];	2005	return altern[RANDOM()%index];
2260	}	2006	}
2261		2007
…		…
2267	*/	2013	*/
2268		2014
2269	int find_first_free_spot(const object *ob, mapstruct *m,int x,int y) {	2015	int find_first_free_spot(const object *ob, mapstruct *m,int x,int y) {
2270	int i;	2016	int i;
2271	for(i=0;i<SIZEOFFREE;i++) {	2017	for(i=0;i<SIZEOFFREE;i++) {
2272	if(!ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i]))	2018	if(!ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i]))
2273	return i;	2019	return i;
2274	}	2020	}
2275	return -1;	2021	return -1;
2276	}	2022	}
2277		2023
2278	/*	2024	/*
…		…
2284	int i, j, tmp, len;	2030	int i, j, tmp, len;
2285		2031
2286	len = end-begin;	2032	len = end-begin;
2287	for(i = begin; i < end; i++)	2033	for(i = begin; i < end; i++)
2288	{	2034	{
2289	j = begin+RANDOM()%len;	2035	j = begin+RANDOM()%len;
2290		2036
2291	tmp = arr[i];	2037	tmp = arr[i];
2292	arr[i] = arr[j];	2038	arr[i] = arr[j];
2293	arr[j] = tmp;	2039	arr[j] = tmp;
2294	}	2040	}
2295	}	2041	}
2296		2042
2297	/* new function to make monster searching more efficient, and effective!	2043	/* new function to make monster searching more efficient, and effective!
2298	* This basically returns a randomized array (in the passed pointer) of	2044	* This basically returns a randomized array (in the passed pointer) of
…		…
2305	{	2051	{
2306	int i;	2052	int i;
2307		2053
2308	for(i = 0; i < SIZEOFFREE; i++)	2054	for(i = 0; i < SIZEOFFREE; i++)
2309	{	2055	{
2310	search_arr[i] = i;	2056	search_arr[i] = i;
2311	}	2057	}
2312		2058
2313	permute(search_arr, 1, SIZEOFFREE1+1);	2059	permute(search_arr, 1, SIZEOFFREE1+1);
2314	permute(search_arr, SIZEOFFREE1+1, SIZEOFFREE2+1);	2060	permute(search_arr, SIZEOFFREE1+1, SIZEOFFREE2+1);
2315	permute(search_arr, SIZEOFFREE2+1, SIZEOFFREE);	2061	permute(search_arr, SIZEOFFREE2+1, SIZEOFFREE);
…		…
2331	int find_dir(mapstruct *m, int x, int y, object *exclude) {	2077	int find_dir(mapstruct *m, int x, int y, object *exclude) {
2332	int i,max=SIZEOFFREE, mflags;	2078	int i,max=SIZEOFFREE, mflags;
2333	sint16 nx, ny;	2079	sint16 nx, ny;
2334	object *tmp;	2080	object *tmp;
2335	mapstruct *mp;	2081	mapstruct *mp;
2336	MoveType blocked, move_type;	2082	MoveType blocked, move_type;
2337		2083
2338	if (exclude && exclude->head) {	2084	if (exclude && exclude->head) {
2339	exclude = exclude->head;	2085	exclude = exclude->head;
2340	move_type = exclude->move_type;	2086	move_type = exclude->move_type;
2341	} else {	2087	} else {
2342	/* If we don't have anything, presume it can use all movement types. */	2088	/* If we don't have anything, presume it can use all movement types. */
2343	move_type=MOVE_ALL;	2089	move_type=MOVE_ALL;
2344	}	2090	}
2345		2091
2346	for(i=1;i<max;i++) {	2092	for(i=1;i<max;i++) {
2347	mp = m;	2093	mp = m;
2348	nx = x + freearr_x[i];	2094	nx = x + freearr_x[i];
2349	ny = y + freearr_y[i];	2095	ny = y + freearr_y[i];
2350		2096
2351	mflags = get_map_flags(m, &mp, nx, ny, &nx, &ny);	2097	mflags = get_map_flags(m, &mp, nx, ny, &nx, &ny);
2352	if (mflags & P_OUT_OF_MAP) {	2098	if (mflags & P_OUT_OF_MAP) {
2353	max = maxfree[i];	2099	max = maxfree[i];
2354	} else {	2100	} else {
2355	blocked = GET_MAP_MOVE_BLOCK(mp, nx, ny);	2101	blocked = GET_MAP_MOVE_BLOCK(mp, nx, ny);
2356		2102
2357	if ((move_type & blocked) == move_type) {	2103	if ((move_type & blocked) == move_type) {
2358	max=maxfree[i];	2104	max=maxfree[i];
2359	} else if (mflags & P_IS_ALIVE) {	2105	} else if (mflags & P_IS_ALIVE) {
2360	for (tmp=GET_MAP_OB(mp,nx,ny); tmp!= NULL; tmp=tmp->above) {	2106	for (tmp=GET_MAP_OB(mp,nx,ny); tmp!= NULL; tmp=tmp->above) {
2361	if ((QUERY_FLAG(tmp,FLAG_MONSTER) || tmp->type==PLAYER) &&	2107	if ((QUERY_FLAG(tmp,FLAG_MONSTER) || tmp->type==PLAYER) &&
2362	(tmp != exclude ||(tmp->head && tmp->head != exclude))) {	2108	(tmp != exclude ||(tmp->head && tmp->head != exclude))) {
2363	break;	2109	break;
2364	}	2110	}
2365	}	2111	}
2366	if(tmp) {	2112	if(tmp) {
2367	return freedir[i];	2113	return freedir[i];
2368	}	2114	}
2369	}	2115	}
2370	}	2116	}
2371	}	2117	}
2372	return 0;	2118	return 0;
2373	}	2119	}
2374		2120
2375	/*	2121	/*
…		…
2539	if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW)) return 0;	2285	if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW)) return 0;
2540		2286
2541	/* yes, can see. */	2287	/* yes, can see. */
2542	if(dir < 9) return 1;	2288	if(dir < 9) return 1;
2543	return can_see_monsterP(m, x, y, reduction_dir[dir][0]) |	2289	return can_see_monsterP(m, x, y, reduction_dir[dir][0]) |
2544	can_see_monsterP(m,x,y, reduction_dir[dir][1]) |	2290	can_see_monsterP(m,x,y, reduction_dir[dir][1]) |
2545	can_see_monsterP(m,x,y, reduction_dir[dir][2]);	2291	can_see_monsterP(m,x,y, reduction_dir[dir][2]);
2546	}	2292	}
2547		2293
2548		2294
2549		2295
2550	/*	2296	/*
2551	* can_pick(picker, item): finds out if an object is possible to be	2297	* can_pick(picker, item): finds out if an object is possible to be
2552	* picked up by the picker. Returnes 1 if it can be	2298	* picked up by the picker. Returnes 1 if it can be
2553	* picked up, otherwise 0.	2299	* picked up, otherwise 0.
2554	*	2300	*
…		…
2559	*/	2305	*/
2560		2306
2561	int can_pick(const object *who, const object *item) {	2307	int can_pick(const object *who, const object *item) {
2562	return /*QUERY_FLAG(who,FLAG_WIZ)||*/	2308	return /*QUERY_FLAG(who,FLAG_WIZ)||*/
2563	(item->weight>0&&!QUERY_FLAG(item,FLAG_NO_PICK)&&	2309	(item->weight>0&&!QUERY_FLAG(item,FLAG_NO_PICK)&&
2564	!QUERY_FLAG(item,FLAG_ALIVE)&&!item->invisible &&	2310	!QUERY_FLAG(item,FLAG_ALIVE)&&!item->invisible &&
2565	(who->type==PLAYER||item->weight<who->weight/3));	2311	(who->type==PLAYER||item->weight<who->weight/3));
2566	}	2312	}
2567		2313
2568		2314
2569	/*	2315	/*
…		…
2594	prev->more = tmp;	2340	prev->more = tmp;
2595	prev = tmp;	2341	prev = tmp;
2596	}	2342	}
2597	/*** copy inventory ***/	2343	/*** copy inventory ***/
2598	for(item = src->inv; item; item = item->below) {	2344	for(item = src->inv; item; item = item->below) {
2599	(void) insert_ob_in_ob(object_create_clone(item),dst);	2345	(void) insert_ob_in_ob(object_create_clone(item),dst);
2600	}	2346	}
2601		2347
2602	return dst;	2348	return dst;
2603	}	2349	}
2604		2350
…		…
2618	/* Also remember that multiparts objects are not supported for now. */	2364	/* Also remember that multiparts objects are not supported for now. */
2619		2365
2620	object* load_object_str(const char *obstr)	2366	object* load_object_str(const char *obstr)
2621	{	2367	{
2622	object *op;	2368	object *op;
2623	FILE *tempfile;
2624	char filename[MAX_BUF];	2369	char filename[MAX_BUF];
2625	sprintf(filename,"%s/cfloadobstr2044",settings.tmpdir);	2370	sprintf(filename,"%s/cfloadobstr2044",settings.tmpdir);
		2371
2626	tempfile=fopen(filename,"w");	2372	FILE *tempfile=fopen(filename,"w");
2627	if (tempfile == NULL)	2373	if (tempfile == NULL)
2628	{	2374	{
2629	LOG(llevError,"Error - Unable to access load object temp file\n");	2375	LOG(llevError,"Error - Unable to access load object temp file\n");
2630	return NULL;	2376	return NULL;
2631	};	2377	};
2632	fprintf(tempfile,obstr);	2378	fprintf(tempfile,obstr);
2633	fclose(tempfile);	2379	fclose(tempfile);
2634		2380
2635	op=get_object();	2381	op=get_object();
2636		2382
2637	tempfile=fopen(filename,"r");
2638	if (tempfile == NULL)
2639	{
2640	LOG(llevError,"Error - Unable to read object temp file\n");
2641	return NULL;
2642	};
2643	object_thawer thawer (tempfile);	2383	object_thawer thawer (filename);
		2384
		2385	if (thawer)
2644	load_object(thawer,op,LO_NEWFILE,0);	2386	load_object(thawer,op,0);
		2387
2645	LOG(llevDebug," load str completed, object=%s\n",op->name);	2388	LOG(llevDebug," load str completed, object=%s\n", &op->name);
2646	CLEAR_FLAG(op,FLAG_REMOVED);	2389	CLEAR_FLAG(op,FLAG_REMOVED);
2647	fclose(tempfile);	2390
2648	return op;	2391	return op;
2649	}	2392	}
2650		2393
2651	/* This returns the first object in who's inventory that	2394	/* This returns the first object in who's inventory that
2652	* has the same type and subtype match.	2395	* has the same type and subtype match.
…		…
2655	object *find_obj_by_type_subtype(const object *who, int type, int subtype)	2398	object *find_obj_by_type_subtype(const object *who, int type, int subtype)
2656	{	2399	{
2657	object *tmp;	2400	object *tmp;
2658		2401
2659	for (tmp=who->inv; tmp; tmp=tmp->below)	2402	for (tmp=who->inv; tmp; tmp=tmp->below)
2660	if (tmp->type == type && tmp->subtype == subtype) return tmp;	2403	if (tmp->type == type && tmp->subtype == subtype) return tmp;
2661		2404
2662	return NULL;	2405	return NULL;
2663	}	2406	}
2664		2407
2665	/* If ob has a field named key, return the link from the list,	2408	/* If ob has a field named key, return the link from the list,
…		…
2689	*/	2432	*/
2690	const char * get_ob_key_value(const object * op, const char * const key) {	2433	const char * get_ob_key_value(const object * op, const char * const key) {
2691	key_value * link;	2434	key_value * link;
2692	const char * canonical_key;	2435	const char * canonical_key;
2693		2436
2694	canonical_key = find_string(key);	2437	canonical_key = shstr::find (key);
2695		2438
2696	if (canonical_key == NULL) {	2439	if (canonical_key == NULL) {
2697	/* 1. There being a field named key on any object	2440	/* 1. There being a field named key on any object
2698	* implies there'd be a shared string to find.	2441	* implies there'd be a shared string to find.
2699	* 2. Since there isn't, no object has this field.	2442	* 2. Since there isn't, no object has this field.
…		…
2722	* Unless add_key is TRUE, it won't add fields, only change the value of existing	2465	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2723	* keys.	2466	* keys.
2724	*	2467	*
2725	* Returns TRUE on success.	2468	* Returns TRUE on success.
2726	*/	2469	*/
2727	int set_ob_key_value_s(object * op, const char * canonical_key, const char * value, int add_key) {	2470	int set_ob_key_value_s(object * op, const shstr &canonical_key, const char * value, int add_key) {
2728	key_value * field = NULL, *last=NULL;	2471	key_value * field = NULL, *last=NULL;
2729		2472
2730	for (field=op->key_values; field != NULL; field=field->next) {	2473	for (field=op->key_values; field != NULL; field=field->next) {
2731	if (field->key != canonical_key) {	2474	if (field->key != canonical_key) {
2732	last = field;	2475	last = field;
2733	continue;	2476	continue;
2734	}	2477	}
2735		2478
2736	if (field->value) FREE_AND_CLEAR_STR(field->value);	2479	if (value)
2737	if (value)	2480	field->value = value;
2738	field->value = add_string(value);	2481	else {
2739	else {
2740	/* Basically, if the archetype has this key set,	2482	/* Basically, if the archetype has this key set,
2741	* we need to store the null value so when we save	2483	* we need to store the null value so when we save
2742	* it, we save the empty value so that when we load,	2484	* it, we save the empty value so that when we load,
2743	* we get this value back again.	2485	* we get this value back again.
2744	*/	2486	*/
2745	if (get_ob_key_link(&op->arch->clone, canonical_key))	2487	if (get_ob_key_link (&op->arch->clone, canonical_key))
2746	field->value = NULL;	2488	field->value = 0;
2747	else {	2489	else
2748	/* Delete this link */	2490	{
2749	if (field->key) FREE_AND_CLEAR_STR(field->key);
2750	if (field->value) FREE_AND_CLEAR_STR(field->value);
2751	if (last) last->next = field->next;	2491	if (last) last->next = field->next;
2752	else op->key_values = field->next;	2492	else op->key_values = field->next;
2753	free(field);	2493
2754	}	2494	delete field;
2755	}	2495	}
		2496	}
2756	return TRUE;	2497	return TRUE;
2757	}	2498	}
2758	/* IF we get here, key doesn't exist */	2499	/* IF we get here, key doesn't exist */
2759		2500
2760	/* No field, we'll have to add it. */	2501	/* No field, we'll have to add it. */
…		…
2768	* be here. If user wants to store empty strings,	2509	* be here. If user wants to store empty strings,
2769	* should pass in ""	2510	* should pass in ""
2770	*/	2511	*/
2771	if (value == NULL) return TRUE;	2512	if (value == NULL) return TRUE;
2772		2513
2773	field = (key_value *) malloc(sizeof(key_value));	2514	field = new key_value;
2774		2515
2775	field->key = add_refcount(canonical_key);	2516	field->key = canonical_key;
2776	field->value = add_string(value);	2517	field->value = value;
2777	/* Usual prepend-addition. */	2518	/* Usual prepend-addition. */
2778	field->next = op->key_values;	2519	field->next = op->key_values;
2779	op->key_values = field;	2520	op->key_values = field;
2780		2521
2781	return TRUE;	2522	return TRUE;
…		…
2788	* and not add new ones.	2529	* and not add new ones.
2789	* In general, should be little reason FALSE is ever passed in for add_key	2530	* In general, should be little reason FALSE is ever passed in for add_key
2790	*	2531	*
2791	* Returns TRUE on success.	2532	* Returns TRUE on success.
2792	*/	2533	*/
2793	int set_ob_key_value(object * op, const char * key, const char * value, int add_key) {	2534	int set_ob_key_value(object * op, const char *key, const char * value, int add_key)
2794	const char * canonical_key = NULL;	2535	{
2795	int floating_ref = FALSE;	2536	shstr key_ (key);
2796	int ret;
2797
2798	/* HACK This mess is to make sure set_ob_value() passes a shared string
2799	* to get_ob_key_link(), without leaving a leaked refcount.
2800	*/
2801
2802	canonical_key = find_string(key);
2803	if (canonical_key == NULL) {
2804	canonical_key = add_string(key);
2805	floating_ref = TRUE;
2806	}
2807
2808	ret = set_ob_key_value_s(op, canonical_key, value, add_key);	2537	return set_ob_key_value_s (op, key_, value, add_key);
2809
2810	if (floating_ref) {
2811	free_string(canonical_key);
2812	}
2813
2814	return ret;
2815	}	2538	}

Diff Legend

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