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.2 by root, Fri Aug 25 17:11:52 2006 UTC vs.
Revision 1.10 by root, Thu Aug 31 17:54:14 2006 UTC

1	/*	1	/*
2	* static char *rcsid_object_c =	2	* static char *rcsid_object_c =
3	* "$Id: object.C,v 1.2 2006/08/25 17:11:52 root Exp $";	3	* "$Id: object.C,v 1.10 2006/08/31 17:54:14 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
…		…
52		52
53	object *objects; /* Pointer to the list of used objects */	53	object *objects; /* Pointer to the list of used objects */
54	object *free_objects; /* Pointer to the list of unused 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 */	55	object *active_objects; /* List of active objects that need to be processed */
56		56
57	void (*object_free_callback)(object *ob);
58
59	short freearr_x[SIZEOFFREE]=	57	short freearr_x[SIZEOFFREE]=
60	{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,	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,
61	0,1,2,3,3,3,3,3,3,3,2,1,0,-1,-2,-3,-3,-3,-3,-3,-3,-3,-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};
62	short freearr_y[SIZEOFFREE]=	60	short freearr_y[SIZEOFFREE]=
63	{0,-1,-1,0,1,1,1,0,-1,-2,-2,-2,-1,0,1,2,2,2,2,2,1,0,-1,-2,-2,	61	{0,-1,-1,0,1,1,1,0,-1,-2,-2,-2,-1,0,1,2,2,2,2,2,1,0,-1,-2,-2,
…		…
134	/* Note sure why the following is the case - either the object has to	132	/* Note sure why the following is the case - either the object has to
135	* be animated or have a very low speed. Is this an attempted monster	133	* be animated or have a very low speed. Is this an attempted monster
136	* check?	134	* check?
137	*/	135	*/
138	if (!QUERY_FLAG(ob1,FLAG_ANIMATE) && FABS((ob1)->speed) > MIN_ACTIVE_SPEED)	136	if (!QUERY_FLAG(ob1,FLAG_ANIMATE) && FABS((ob1)->speed) > MIN_ACTIVE_SPEED)
139	return 0;	137	return 0;
140		138
141	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	139	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
142	* value could not be stored in a sint32 (which unfortunately sometimes is	140	* value could not be stored in a sint32 (which unfortunately sometimes is
143	* used to store nrof).	141	* used to store nrof).
144	*/	142	*/
145	if (ob1->nrof+ob2->nrof >= 1UL<<31)	143	if (ob1->nrof+ob2->nrof >= 1UL<<31)
146	return 0;	144	return 0;
147		145
148	/* This is really a spellbook check - really, we should	146	/* This is really a spellbook check - really, we should
149	* check all objects in the inventory.	147	* check all objects in the inventory.
150	*/	148	*/
151	if (ob1->inv || ob2->inv) {	149	if (ob1->inv || ob2->inv) {
152	/* if one object has inventory but the other doesn't, not equiv */	150	/* if one object has inventory but the other doesn't, not equiv */
153	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) return 0;	151	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) return 0;
154		152
155	/* Now check to see if the two inventory objects could merge */	153	/* Now check to see if the two inventory objects could merge */
156	if (!CAN_MERGE(ob1->inv, ob2->inv)) return 0;	154	if (!CAN_MERGE(ob1->inv, ob2->inv)) return 0;
157		155
158	/* inventory ok - still need to check rest of this object to see	156	/* inventory ok - still need to check rest of this object to see
159	* if it is valid.	157	* if it is valid.
160	*/	158	*/
161	}	159	}
162		160
163	/* If the objects have been identified, set the BEEN_APPLIED flag.	161	/* If the objects have been identified, set the BEEN_APPLIED flag.
164	* This is to the comparison of the flags below will be OK. We	162	* This is to the comparison of the flags below will be OK. We
165	* just can't ignore the been applied or identified flags, as they	163	* just can't ignore the been applied or identified flags, as they
166	* are not equal - just if it has been identified, the been_applied	164	* are not equal - just if it has been identified, the been_applied
167	* flags lose any meaning.	165	* flags lose any meaning.
168	*/	166	*/
169	if (QUERY_FLAG(ob1, FLAG_IDENTIFIED))	167	if (QUERY_FLAG(ob1, FLAG_IDENTIFIED))
170	SET_FLAG(ob1, FLAG_BEEN_APPLIED);	168	SET_FLAG(ob1, FLAG_BEEN_APPLIED);
171		169
172	if (QUERY_FLAG(ob2, FLAG_IDENTIFIED))	170	if (QUERY_FLAG(ob2, FLAG_IDENTIFIED))
173	SET_FLAG(ob2, FLAG_BEEN_APPLIED);	171	SET_FLAG(ob2, FLAG_BEEN_APPLIED);
174		172
175		173
176	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	174	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something
177	* being locked in inventory should prevent merging.	175	* being locked in inventory should prevent merging.
178	* 0x4 in flags3 is CLIENT_SENT	176	* 0x4 in flags3 is CLIENT_SENT
179	*/	177	*/
180	if ((ob1->arch != ob2->arch) ||	178	if ((ob1->arch != ob2->arch) ||
181	(ob1->flags[0] != ob2->flags[0]) ||	179	(ob1->flags[0] != ob2->flags[0]) ||
182	(ob1->flags[1] != ob2->flags[1]) ||	180	(ob1->flags[1] != ob2->flags[1]) ||
183	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~ 0x400000)) ||	181	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~ 0x400000)) ||
184	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||	182	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
185	(ob1->name != ob2->name) ||	183	(ob1->name != ob2->name) ||
186	(ob1->title != ob2->title) ||	184	(ob1->title != ob2->title) ||
187	(ob1->msg != ob2->msg) ||	185	(ob1->msg != ob2->msg) ||
188	(ob1->weight != ob2->weight) ||	186	(ob1->weight != ob2->weight) ||
189	(memcmp(&ob1->resist, &ob2->resist, sizeof(ob1->resist))!=0) ||	187	(memcmp(&ob1->resist, &ob2->resist, sizeof(ob1->resist))!=0) ||
190	(memcmp(&ob1->stats, &ob2->stats, sizeof(ob1->stats))!=0) ||	188	(memcmp(&ob1->stats, &ob2->stats, sizeof(ob1->stats))!=0) ||
191	(ob1->attacktype != ob2->attacktype) ||	189	(ob1->attacktype != ob2->attacktype) ||
192	(ob1->magic != ob2->magic) ||	190	(ob1->magic != ob2->magic) ||
193	(ob1->slaying != ob2->slaying) ||	191	(ob1->slaying != ob2->slaying) ||
194	(ob1->skill != ob2->skill) ||	192	(ob1->skill != ob2->skill) ||
195	(ob1->value != ob2->value) ||	193	(ob1->value != ob2->value) ||
196	(ob1->animation_id != ob2->animation_id) ||	194	(ob1->animation_id != ob2->animation_id) ||
197	(ob1->client_type != ob2->client_type) ||	195	(ob1->client_type != ob2->client_type) ||
198	(ob1->materialname != ob2->materialname) ||	196	(ob1->materialname != ob2->materialname) ||
199	(ob1->lore != ob2->lore) ||	197	(ob1->lore != ob2->lore) ||
200	(ob1->subtype != ob2->subtype) ||	198	(ob1->subtype != ob2->subtype) ||
201	(ob1->move_type != ob2->move_type) ||	199	(ob1->move_type != ob2->move_type) ||
202	(ob1->move_block != ob2->move_block) ||	200	(ob1->move_block != ob2->move_block) ||
203	(ob1->move_allow != ob2->move_allow) ||	201	(ob1->move_allow != ob2->move_allow) ||
204	(ob1->move_on != ob2->move_on) ||	202	(ob1->move_on != ob2->move_on) ||
205	(ob1->move_off != ob2->move_off) ||	203	(ob1->move_off != ob2->move_off) ||
206	(ob1->move_slow != ob2->move_slow) ||	204	(ob1->move_slow != ob2->move_slow) ||
207	(ob1->move_slow_penalty != ob2->move_slow_penalty)	205	(ob1->move_slow_penalty != ob2->move_slow_penalty)
208	)	206	)
209	return 0;	207	return 0;
210		208
211	/* Don't merge objects that are applied. With the new 'body' code,	209	/* Don't merge objects that are applied. With the new 'body' code,
212	* it is possible for most any character to have more than one of	210	* it is possible for most any character to have more than one of
213	* some items equipped, and we don't want those to merge.	211	* some items equipped, and we don't want those to merge.
214	*/	212	*/
215	if (QUERY_FLAG(ob1, FLAG_APPLIED) || QUERY_FLAG(ob2, FLAG_APPLIED))	213	if (QUERY_FLAG(ob1, FLAG_APPLIED) || QUERY_FLAG(ob2, FLAG_APPLIED))
216	return 0;	214	return 0;
217		215
218	switch (ob1->type) {	216	switch (ob1->type) {
219	case SCROLL:	217	case SCROLL:
220	if (ob1->level != ob2->level) return 0;	218	if (ob1->level != ob2->level) return 0;
221	break;	219	break;
222		220
223	}	221	}
224	if (ob1->key_values != NULL || ob2->key_values != NULL) {	222	if (ob1->key_values != NULL || ob2->key_values != NULL) {
225	/* At least one of these has key_values. */	223	/* At least one of these has key_values. */
226	if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) {	224	if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) {
…		…
243	signed long sum_weight(object *op) {	241	signed long sum_weight(object *op) {
244	signed long sum;	242	signed long sum;
245	object *inv;	243	object *inv;
246	for(sum = 0, inv = op->inv; inv != NULL; inv = inv->below) {	244	for(sum = 0, inv = op->inv; inv != NULL; inv = inv->below) {
247	if (inv->inv)	245	if (inv->inv)
248	sum_weight(inv);	246	sum_weight(inv);
249	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	247	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
250	}	248	}
251	if (op->type == CONTAINER && op->stats.Str)	249	if (op->type == CONTAINER && op->stats.Str)
252	sum = (sum * (100 - op->stats.Str))/100;	250	sum = (sum * (100 - op->stats.Str))/100;
253	if(op->carrying != sum)	251	if(op->carrying != sum)
…		…
272	*/	270	*/
273		271
274	object *is_player_inv (object *op) {	272	object *is_player_inv (object *op) {
275	for (;op!=NULL&&op->type!=PLAYER; op=op->env)	273	for (;op!=NULL&&op->type!=PLAYER; op=op->env)
276	if (op->env==op)	274	if (op->env==op)
277	op->env = NULL;	275	op->env = NULL;
278	return op;	276	return op;
279	}	277	}
280		278
281	/*	279	/*
282	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	280	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
283	* Some error messages.	281	* Some error messages.
284	* The result of the dump is stored in the static global errmsg array.	282	* The result of the dump is stored in the static global errmsg array.
285	*/	283	*/
286		284
287	void dump_object2(object *op) {	285	void dump_object2(object *op) {
		286	errmsg[0] = 0;
		287	return;
		288	//TODO//D#d#
		289	#if 0
288	char *cp;	290	char *cp;
289	/* object *tmp;*/	291	/* object *tmp;*/
290		292
291	if(op->arch!=NULL) {	293	if(op->arch!=NULL) {
292	strcat(errmsg,"arch ");	294	strcat(errmsg,"arch ");
293	strcat(errmsg,op->arch->name?op->arch->name:"(null)");	295	strcat(errmsg,op->arch->name?op->arch->name:"(null)");
294	strcat(errmsg,"\n");	296	strcat(errmsg,"\n");
295	if((cp=get_ob_diff(op,&empty_archetype->clone))!=NULL)	297	if((cp=get_ob_diff(op,&empty_archetype->clone))!=NULL)
296	strcat(errmsg,cp);	298	strcat(errmsg,cp);
297	#if 0	299	#if 0
298	/* Don't dump player diffs - they are too long, mostly meaningless, and	300	/* Don't dump player diffs - they are too long, mostly meaningless, and
299	* will overflow the buffer.	301	* will overflow the buffer.
300	* Changed so that we don't dump inventory either. This may	302	* Changed so that we don't dump inventory either. This may
301	* also overflow the buffer.	303	* also overflow the buffer.
…		…
317	for (tmp=op->inv; tmp; tmp=tmp->below)	319	for (tmp=op->inv; tmp; tmp=tmp->below)
318	dump_object2(tmp);	320	dump_object2(tmp);
319	#endif	321	#endif
320	strcat(errmsg,"end\n");	322	strcat(errmsg,"end\n");
321	}	323	}
		324	#endif
322	}	325	}
323		326
324	/*	327	/*
325	* Dumps an object. Returns output in the static global errmsg array.	328	* Dumps an object. Returns output in the static global errmsg array.
326	*/	329	*/
…		…
331	return;	334	return;
332	}	335	}
333	errmsg[0]='\0';	336	errmsg[0]='\0';
334	dump_object2(op);	337	dump_object2(op);
335	}	338	}
336
337	/* GROS - Dumps an object. Return the result into a string */
338	/* Note that no checking is done for the validity of the target string, so */
339	/* you need to be sure that you allocated enough space for it. */
340	void dump_me(object *op, char *outstr)
341	{
342	char *cp;
343
344	if(op==NULL)
345	{
346	strcpy(outstr,"[NULL pointer]");
347	return;
348	}
349	outstr[0]='\0';
350
351	if(op->arch!=NULL)
352	{
353	strcat(outstr,"arch ");
354	strcat(outstr,op->arch->name?op->arch->name:"(null)");
355	strcat(outstr,"\n");
356	if((cp=get_ob_diff(op,&empty_archetype->clone))!=NULL)
357	strcat(outstr,cp);
358	strcat(outstr,"end\n");
359	}
360	else
361	{
362	strcat(outstr,"Object ");
363	if (op->name==NULL)
364	strcat(outstr, "(null)");
365	else
366	strcat(outstr,op->name);
367	strcat(outstr,"\n");
368	strcat(outstr,"end\n");
369	}
370	}
371
372	/*
373	* This is really verbose...Can be triggered by the P key while in DM mode.
374	* All objects are dumped to stderr (or alternate logfile, if in server-mode)
375	*/
376		339
377	void dump_all_objects(void) {	340	void dump_all_objects(void) {
378	object *op;	341	object *op;
379	for(op=objects;op!=NULL;op=op->next) {	342	for(op=objects;op!=NULL;op=op->next) {
380	dump_object(op);	343	dump_object(op);
…		…
430	void free_all_object_data(void) {	393	void free_all_object_data(void) {
431	#ifdef MEMORY_DEBUG	394	#ifdef MEMORY_DEBUG
432	object *op, *next;	395	object *op, *next;
433		396
434	for (op=free_objects; op!=NULL; ) {	397	for (op=free_objects; op!=NULL; ) {
435	next=op->next;	398	next=op->next;
436	free(op);	399	free(op);
437	nrofallocobjects--;	400	nrofallocobjects--;
438	nroffreeobjects--;	401	nroffreeobjects--;
439	op=next;	402	op=next;
440	}	403	}
441	#endif	404	#endif
442	LOG(llevDebug,"%d allocated objects, %d free objects, STARMAX=%d\n",	405	LOG(llevDebug,"%d allocated objects, %d free objects, STARMAX=%d\n",
443	nrofallocobjects, nroffreeobjects,STARTMAX);	406	nrofallocobjects, nroffreeobjects,STARTMAX);
444	}	407	}
445		408
446	/*	409	/*
447	* Returns the object which this object marks as being the owner.	410	* Returns the object which this object marks as being the owner.
448	* A id-scheme is used to avoid pointing to objects which have been	411	* A id-scheme is used to avoid pointing to objects which have been
…		…
454	* anything - once an object is removed, it is basically dead anyways.	417	* anything - once an object is removed, it is basically dead anyways.
455	*/	418	*/
456		419
457	object *get_owner(object *op) {	420	object *get_owner(object *op) {
458	if(op->owner==NULL)	421	if(op->owner==NULL)
459	return NULL;	422	return NULL;
460		423
461	if (!QUERY_FLAG(op->owner,FLAG_FREED) && !QUERY_FLAG(op->owner, FLAG_REMOVED) &&	424	if (!QUERY_FLAG(op->owner,FLAG_FREED) && !QUERY_FLAG(op->owner, FLAG_REMOVED) &&
462	op->owner->count==op->ownercount)	425	op->owner->count==op->ownercount)
463	return op->owner;	426	return op->owner;
464		427
465	op->owner=NULL;	428	op->owner=NULL;
466	op->ownercount=0;	429	op->ownercount=0;
467	return NULL;	430	return NULL;
468	}	431	}
…		…
470	void clear_owner(object *op)	433	void clear_owner(object *op)
471	{	434	{
472	if (!op) return;	435	if (!op) return;
473		436
474	if (op->owner && op->ownercount == op->owner->count)	437	if (op->owner && op->ownercount == op->owner->count)
475	op->owner->refcount--;	438	op->owner->refcount--;
476		439
477	op->owner = NULL;	440	op->owner = NULL;
478	op->ownercount = 0;	441	op->ownercount = 0;
479	}	442	}
480		443
…		…
485	* skill and experience objects.	448	* skill and experience objects.
486	*/	449	*/
487	void set_owner (object *op, object *owner)	450	void set_owner (object *op, object *owner)
488	{	451	{
489	if(owner==NULL||op==NULL)	452	if(owner==NULL||op==NULL)
490	return;	453	return;
491		454
492	/* next line added to allow objects which own objects */	455	/* next line added to allow objects which own objects */
493	/* Add a check for ownercounts in here, as I got into an endless loop	456	/* Add a check for ownercounts in here, as I got into an endless loop
494	* with the fireball owning a poison cloud which then owned the	457	* with the fireball owning a poison cloud which then owned the
495	* fireball. I believe that was caused by one of the objects getting	458	* fireball. I believe that was caused by one of the objects getting
496	* freed and then another object replacing it. Since the ownercounts	459	* freed and then another object replacing it. Since the ownercounts
497	* didn't match, this check is valid and I believe that cause is valid.	460	* didn't match, this check is valid and I believe that cause is valid.
498	*/	461	*/
499	while (owner->owner && owner!=owner->owner &&	462	while (owner->owner && owner!=owner->owner &&
500	owner->ownercount==owner->owner->count) owner=owner->owner;	463	owner->ownercount==owner->owner->count) owner=owner->owner;
501		464
502	/* IF the owner still has an owner, we did not resolve to a final owner.	465	/* IF the owner still has an owner, we did not resolve to a final owner.
503	* so lets not add to that.	466	* so lets not add to that.
504	*/	467	*/
505	if (owner->owner) return;	468	if (owner->owner) return;
…		…
523	*/	486	*/
524	void copy_owner (object *op, object *clone)	487	void copy_owner (object *op, object *clone)
525	{	488	{
526	object *owner = get_owner (clone);	489	object *owner = get_owner (clone);
527	if (owner == NULL) {	490	if (owner == NULL) {
528	/* players don't have owners - they own themselves. Update	491	/* players don't have owners - they own themselves. Update
529	* as appropriate.	492	* as appropriate.
530	*/	493	*/
531	if (clone->type == PLAYER) owner=clone;	494	if (clone->type == PLAYER) owner=clone;
532	else return;	495	else return;
533	}	496	}
534	set_owner(op, owner);	497	set_owner(op, owner);
535		498
536	}	499	}
537		500
…		…
548	op->slaying = NULL;	511	op->slaying = NULL;
549	op->skill = NULL;	512	op->skill = NULL;
550	op->msg = NULL;	513	op->msg = NULL;
551	op->materialname = NULL;	514	op->materialname = NULL;
552	op->lore = NULL;	515	op->lore = NULL;
553	op->current_weapon_script = NULL;
554	clear_object(op);	516	clear_object(op);
555	}	517	}
556		518
557	/* Zero the key_values on op, decrementing the shared-string	519	/* Zero the key_values on op, decrementing the shared-string
558	* refcounts and freeing the links.	520	* refcounts and freeing the links.
…		…
565		527
566	for (i = op->key_values; i != NULL; i = next) {	528	for (i = op->key_values; i != NULL; i = next) {
567	/* Store next *first*. */	529	/* Store next *first*. */
568	next = i->next;	530	next = i->next;
569		531
570	if (i->key) FREE_AND_CLEAR_STR(i->key);	532	if (i->key) FREE_AND_CLEAR_STR(i->key);
571	if (i->value) FREE_AND_CLEAR_STR(i->value);	533	if (i->value) FREE_AND_CLEAR_STR(i->value);
572	i->next = NULL;	534	i->next = NULL;
573	free(i);	535	free(i);
574	}	536	}
575		537
576	op->key_values = NULL;	538	op->key_values = NULL;
…		…
581	* clear_object() frees everything allocated by an object, and also	543	* clear_object() frees everything allocated by an object, and also
582	* clears all variables and flags to default settings.	544	* clears all variables and flags to default settings.
583	*/	545	*/
584		546
585	void clear_object(object *op) {	547	void clear_object(object *op) {
586		548	op->clear ();
587	if (object_free_callback)
588	object_free_callback (op);
589		549
590	event *evt;	550	event *evt;
591	event *evt2;	551	event *evt2;
592		552
593	/* redo this to be simpler/more efficient. Was also seeing	553	/* redo this to be simpler/more efficient. Was also seeing
594	* crashes in the old code. Move this to the top - am	554	* crashes in the old code. Move this to the top - am
595	* seeing periodic crashes in this code, and would like to have	555	* seeing periodic crashes in this code, and would like to have
596	* as much info available as possible (eg, object name).	556	* as much info available as possible (eg, object name).
597	*/	557	*/
598	for (evt = op->events; evt; evt=evt2) {	558	for (evt = op->events; evt; evt=evt2) {
599	evt2 = evt->next;	559	evt2 = evt->next;
600		560
601	if (evt->hook != NULL) FREE_AND_CLEAR_STR(evt->hook);	561	if (evt->hook != NULL) FREE_AND_CLEAR_STR(evt->hook);
602	if (evt->plugin != NULL) FREE_AND_CLEAR_STR(evt->plugin);	562	if (evt->plugin != NULL) FREE_AND_CLEAR_STR(evt->plugin);
603	if (evt->options != NULL) FREE_AND_CLEAR_STR(evt->options);	563	if (evt->options != NULL) FREE_AND_CLEAR_STR(evt->options);
604		564
…		…
647		607
648	op->expmul=1.0;	608	op->expmul=1.0;
649	op->face = blank_face;	609	op->face = blank_face;
650	op->attacked_by_count = (tag_t) -1;	610	op->attacked_by_count = (tag_t) -1;
651	if (settings.casting_time)	611	if (settings.casting_time)
652	op->casting_time = -1;	612	op->casting_time = -1;
653		613
654	}	614	}
655		615
656	/*	616	/*
657	* copy object first frees everything allocated by the second object,	617	* copy object first frees everything allocated by the second object,
…		…
664		624
665	void copy_object(object *op2, object *op) {	625	void copy_object(object *op2, object *op) {
666	int is_freed=QUERY_FLAG(op,FLAG_FREED),is_removed=QUERY_FLAG(op,FLAG_REMOVED);	626	int is_freed=QUERY_FLAG(op,FLAG_FREED),is_removed=QUERY_FLAG(op,FLAG_REMOVED);
667	event *evt, *evt2, *evt_new;	627	event *evt, *evt2, *evt_new;
668		628
669	if (object_free_callback)	629	op->clear ();
670	object_free_callback (op);
671
672	// callback registries and self are empty for copied objects
673	// this ought to change in the future
674		630
675	/* Decrement the refcounts, but don't bother zeroing the fields;	631	/* Decrement the refcounts, but don't bother zeroing the fields;
676	they'll be overwritten by memcpy. */	632	they'll be overwritten by memcpy. */
677	if(op->name!=NULL) free_string(op->name);	633	if(op->name!=NULL) free_string(op->name);
678	if(op->name_pl!=NULL) free_string(op->name_pl);	634	if(op->name_pl!=NULL) free_string(op->name_pl);
…		…
685	if(op->materialname != NULL) free_string(op->materialname);	641	if(op->materialname != NULL) free_string(op->materialname);
686	if(op->custom_name != NULL) free_string(op->custom_name);	642	if(op->custom_name != NULL) free_string(op->custom_name);
687		643
688	/* Basically, same code as from clear_object() */	644	/* Basically, same code as from clear_object() */
689	for (evt = op->events; evt; evt=evt2) {	645	for (evt = op->events; evt; evt=evt2) {
690	evt2 = evt->next;	646	evt2 = evt->next;
691		647
692	if (evt->hook != NULL) FREE_AND_CLEAR_STR(evt->hook);	648	if (evt->hook != NULL) FREE_AND_CLEAR_STR(evt->hook);
693	if (evt->plugin != NULL) FREE_AND_CLEAR_STR(evt->plugin);	649	if (evt->plugin != NULL) FREE_AND_CLEAR_STR(evt->plugin);
694	if (evt->options != NULL) FREE_AND_CLEAR_STR(evt->options);	650	if (evt->options != NULL) FREE_AND_CLEAR_STR(evt->options);
695		651
696	free(evt);	652	free(evt);
697	}	653	}
698	op->events = NULL;	654	op->events = NULL;
699		655
700	free_key_values(op);	656	free_key_values(op);
701		657
702	*(object_special *)op = *(object_special *)op2;	658	*(object_special *)op = *(object_special *)op2;
		659	op2->clone (op);
703		660
704	if(is_freed) SET_FLAG(op,FLAG_FREED);	661	if(is_freed) SET_FLAG(op,FLAG_FREED);
705	if(is_removed) SET_FLAG(op,FLAG_REMOVED);	662	if(is_removed) SET_FLAG(op,FLAG_REMOVED);
706	if(op->name!=NULL) add_refcount(op->name);	663	if(op->name!=NULL) add_refcount(op->name);
707	if(op->name_pl!=NULL) add_refcount(op->name_pl);	664	if(op->name_pl!=NULL) add_refcount(op->name_pl);
…		…
713	if(op->msg!=NULL) add_refcount(op->msg);	670	if(op->msg!=NULL) add_refcount(op->msg);
714	if(op->custom_name!=NULL) add_refcount(op->custom_name);	671	if(op->custom_name!=NULL) add_refcount(op->custom_name);
715	if (op->materialname != NULL) add_refcount(op->materialname);	672	if (op->materialname != NULL) add_refcount(op->materialname);
716		673
717	if((op2->speed<0) && !editor)	674	if((op2->speed<0) && !editor)
718	op->speed_left=op2->speed_left-RANDOM()%200/100.0;	675	op->speed_left=op2->speed_left-RANDOM()%200/100.0;
719		676
720	/* Copy over event information */	677	/* Copy over event information */
721	evt2 = NULL;	678	evt2 = NULL;
722	for (evt = op2->events; evt; evt=evt->next) {	679	for (evt = op2->events; evt; evt=evt->next) {
723	evt_new = (event *) malloc(sizeof(event));	680	evt_new = (event *) malloc(sizeof(event));
724	memcpy(evt_new, evt, sizeof(event));	681	memcpy(evt_new, evt, sizeof(event));
725	if (evt_new->hook) add_refcount(evt_new->hook);	682	if (evt_new->hook) add_refcount(evt_new->hook);
726	if (evt_new->plugin) add_refcount(evt_new->plugin);	683	if (evt_new->plugin) add_refcount(evt_new->plugin);
727	if (evt_new->options) add_refcount(evt_new->options);	684	if (evt_new->options) add_refcount(evt_new->options);
728	evt_new->next = NULL;	685	evt_new->next = NULL;
729		686
730	/* Try to be a little clever here, and store away the	687	/* Try to be a little clever here, and store away the
731	* last event we copied, so that its simpler to update the	688	* last event we copied, so that its simpler to update the
732	* pointer.	689	* pointer.
733	*/	690	*/
734	if (evt2)	691	if (evt2)
735	evt2->next = evt_new;	692	evt2->next = evt_new;
736	else	693	else
737	op->events = evt_new;	694	op->events = evt_new;
738		695
739	evt2 = evt_new;	696	evt2 = evt_new;
740	}	697	}
741	/* Copy over key_values, if any. */	698	/* Copy over key_values, if any. */
742	if (op2->key_values != NULL) {	699	if (op2->key_values != NULL) {
743	key_value * tail = NULL;	700	key_value * tail = NULL;
744	key_value * i;	701	key_value * i;
745		702
746	op->key_values = NULL;	703	op->key_values = NULL;
747		704
748	for (i = op2->key_values; i != NULL; i = i->next) {	705	for (i = op2->key_values; i != NULL; i = i->next) {
749	key_value * new_link = (key_value *) malloc(sizeof(key_value));	706	key_value * new_link = (key_value *) malloc(sizeof(key_value));
750		707
751	new_link->next = NULL;	708	new_link->next = NULL;
752	new_link->key = add_refcount(i->key);	709	new_link->key = add_refcount(i->key);
753	if (i->value)	710	if (i->value)
754	new_link->value = add_refcount(i->value);	711	new_link->value = add_refcount(i->value);
755	else	712	else
756	new_link->value = NULL;	713	new_link->value = NULL;
757		714
758	/* Try and be clever here, too. */	715	/* Try and be clever here, too. */
759	if (op->key_values == NULL) {	716	if (op->key_values == NULL) {
760	op->key_values = new_link;	717	op->key_values = new_link;
761	tail = new_link;	718	tail = new_link;
762	} else {	719	} else {
763	tail->next = new_link;	720	tail->next = new_link;
764	tail = new_link;	721	tail = new_link;
765	}	722	}
766	}	723	}
767	}	724	}
768		725
769	update_ob_speed(op);	726	update_ob_speed(op);
770	}	727	}
771		728
…		…
860	* be called to update the face variable, _and_ how it looks on the map.	817	* be called to update the face variable, _and_ how it looks on the map.
861	*/	818	*/
862		819
863	void update_turn_face(object *op) {	820	void update_turn_face(object *op) {
864	if(!QUERY_FLAG(op,FLAG_IS_TURNABLE)||op->arch==NULL)	821	if(!QUERY_FLAG(op,FLAG_IS_TURNABLE)||op->arch==NULL)
865	return;	822	return;
866	SET_ANIMATION(op, op->direction);	823	SET_ANIMATION(op, op->direction);
867	update_object(op,UP_OBJ_FACE);	824	update_object(op,UP_OBJ_FACE);
868	}	825	}
869		826
870	/*	827	/*
…		…
879	/* No reason putting the archetypes objects on the speed list,	836	/* No reason putting the archetypes objects on the speed list,
880	* since they never really need to be updated.	837	* since they never really need to be updated.
881	*/	838	*/
882		839
883	if (QUERY_FLAG(op, FLAG_FREED) && op->speed) {	840	if (QUERY_FLAG(op, FLAG_FREED) && op->speed) {
884	LOG(llevError,"Object %s is freed but has speed.\n", op->name);	841	LOG(llevError,"Object %s is freed but has speed.\n", op->name);
885	#ifdef MANY_CORES	842	#ifdef MANY_CORES
886	abort();	843	abort();
887	#else	844	#else
888	op->speed = 0;	845	op->speed = 0;
889	#endif	846	#endif
890	}	847	}
891	if (arch_init) {	848	if (arch_init) {
892	return;	849	return;
893	}	850	}
894	if (FABS(op->speed)>MIN_ACTIVE_SPEED) {	851	if (FABS(op->speed)>MIN_ACTIVE_SPEED) {
895	/* If already on active list, don't do anything */	852	/* If already on active list, don't do anything */
896	if (op->active_next || op->active_prev || op==active_objects)	853	if (op->active_next || op->active_prev || op==active_objects)
897	return;	854	return;
898		855
899	/* process_events() expects us to insert the object at the beginning	856	/* process_events() expects us to insert the object at the beginning
900	* of the list. */	857	* of the list. */
901	op->active_next = active_objects;	858	op->active_next = active_objects;
902	if (op->active_next!=NULL)	859	if (op->active_next!=NULL)
903	op->active_next->active_prev = op;	860	op->active_next->active_prev = op;
904	active_objects = op;	861	active_objects = op;
905	}	862	}
906	else {	863	else {
907	/* If not on the active list, nothing needs to be done */	864	/* If not on the active list, nothing needs to be done */
908	if (!op->active_next && !op->active_prev && op!=active_objects)	865	if (!op->active_next && !op->active_prev && op!=active_objects)
909	return;	866	return;
910		867
911	if (op->active_prev==NULL) {	868	if (op->active_prev==NULL) {
912	active_objects = op->active_next;	869	active_objects = op->active_next;
913	if (op->active_next!=NULL)	870	if (op->active_next!=NULL)
914	op->active_next->active_prev = NULL;	871	op->active_next->active_prev = NULL;
915	}	872	}
916	else {	873	else {
917	op->active_prev->active_next = op->active_next;	874	op->active_prev->active_next = op->active_next;
918	if (op->active_next)	875	if (op->active_next)
919	op->active_next->active_prev = op->active_prev;	876	op->active_next->active_prev = op->active_prev;
920	}	877	}
921	op->active_next = NULL;	878	op->active_next = NULL;
922	op->active_prev = NULL;	879	op->active_prev = NULL;
923	}	880	}
924	}	881	}
925		882
926	/* This function removes object 'op' from the list of active	883	/* This function removes object 'op' from the list of active
927	* objects.	884	* objects.
…		…
933	*/	890	*/
934	void remove_from_active_list(object *op)	891	void remove_from_active_list(object *op)
935	{	892	{
936	/* If not on the active list, nothing needs to be done */	893	/* If not on the active list, nothing needs to be done */
937	if (!op->active_next && !op->active_prev && op!=active_objects)	894	if (!op->active_next && !op->active_prev && op!=active_objects)
938	return;	895	return;
939		896
940	if (op->active_prev==NULL) {	897	if (op->active_prev==NULL) {
941	active_objects = op->active_next;	898	active_objects = op->active_next;
942	if (op->active_next!=NULL)	899	if (op->active_next!=NULL)
943	op->active_next->active_prev = NULL;	900	op->active_next->active_prev = NULL;
944	}	901	}
945	else {	902	else {
946	op->active_prev->active_next = op->active_next;	903	op->active_prev->active_next = op->active_next;
947	if (op->active_next)	904	if (op->active_next)
948	op->active_next->active_prev = op->active_prev;	905	op->active_next->active_prev = op->active_prev;
949	}	906	}
950	op->active_next = NULL;	907	op->active_next = NULL;
951	op->active_prev = NULL;	908	op->active_prev = NULL;
952	}	909	}
953		910
…		…
978	MoveType move_on, move_off, move_block, move_slow;	935	MoveType move_on, move_off, move_block, move_slow;
979		936
980	if (op == NULL) {	937	if (op == NULL) {
981	/* this should never happen */	938	/* this should never happen */
982	LOG(llevDebug,"update_object() called for NULL object.\n");	939	LOG(llevDebug,"update_object() called for NULL object.\n");
983	return;	940	return;
984	}	941	}
985		942
986	if(op->env!=NULL) {	943	if(op->env!=NULL) {
987	/* Animation is currently handled by client, so nothing	944	/* Animation is currently handled by client, so nothing
988	* to do in this case.	945	* to do in this case.
989	*/	946	*/
990	return;	947	return;
991	}	948	}
992		949
993	/* If the map is saving, don't do anything as everything is	950	/* If the map is saving, don't do anything as everything is
994	* going to get freed anyways.	951	* going to get freed anyways.
995	*/	952	*/
996	if (!op->map || op->map->in_memory == MAP_SAVING) return;	953	if (!op->map || op->map->in_memory == MAP_SAVING) return;
997		954
998	/* make sure the object is within map boundaries */	955	/* make sure the object is within map boundaries */
999	if (op->x < 0 || op->x >= MAP_WIDTH(op->map) ||	956	if (op->x < 0 || op->x >= MAP_WIDTH(op->map) ||
1000	op->y < 0 || op->y >= MAP_HEIGHT(op->map)) {	957	op->y < 0 || op->y >= MAP_HEIGHT(op->map)) {
1001	LOG(llevError,"update_object() called for object out of map!\n");	958	LOG(llevError,"update_object() called for object out of map!\n");
1002	#ifdef MANY_CORES	959	#ifdef MANY_CORES
1003	abort();	960	abort();
1004	#endif	961	#endif
1005	return;	962	return;
1006	}	963	}
1007		964
1008	flags = GET_MAP_FLAGS(op->map, op->x, op->y);	965	flags = GET_MAP_FLAGS(op->map, op->x, op->y);
1009	SET_MAP_FLAGS(op->map, op->x, op->y, flags | P_NEED_UPDATE);	966	SET_MAP_FLAGS(op->map, op->x, op->y, flags | P_NEED_UPDATE);
1010	move_slow = GET_MAP_MOVE_SLOW(op->map, op->x, op->y);	967	move_slow = GET_MAP_MOVE_SLOW(op->map, op->x, op->y);
…		…
1023	update_now=1;	980	update_now=1;
1024		981
1025	if (QUERY_FLAG(op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))	982	if (QUERY_FLAG(op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
1026	update_now=1;	983	update_now=1;
1027		984
1028	if ((move_on | op->move_on) != move_on) update_now=1;	985	if ((move_on | op->move_on) != move_on) update_now=1;
1029	if ((move_off | op->move_off) != move_off) update_now=1;	986	if ((move_off | op->move_off) != move_off) update_now=1;
1030	/* This isn't perfect, but I don't expect a lot of objects to	987	/* This isn't perfect, but I don't expect a lot of objects to
1031	* to have move_allow right now.	988	* to have move_allow right now.
1032	*/	989	*/
1033	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	990	if (((move_block | op->move_block) & ~op->move_allow) != move_block)
1034	update_now=1;	991	update_now=1;
1035	if ((move_slow | op->move_slow) != move_slow) update_now=1;	992	if ((move_slow | op->move_slow) != move_slow) update_now=1;
1036	}	993	}
1037	/* if the object is being removed, we can't make intelligent	994	/* if the object is being removed, we can't make intelligent
1038	* decisions, because remove_ob can't really pass the object	995	* decisions, because remove_ob can't really pass the object
1039	* that is being removed.	996	* that is being removed.
1040	*/	997	*/
1041	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) {	998	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) {
1042	update_now=1;	999	update_now=1;
1043	} else if (action == UP_OBJ_FACE) {	1000	} else if (action == UP_OBJ_FACE) {
1044	/* Nothing to do for that case */	1001	/* Nothing to do for that case */
1045	}	1002	}
1046	else {	1003	else {
1047	LOG(llevError,"update_object called with invalid action: %d\n", action);	1004	LOG(llevError,"update_object called with invalid action: %d\n", action);
1048	}	1005	}
1049		1006
1050	if (update_now) {	1007	if (update_now) {
1051	SET_MAP_FLAGS(op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);	1008	SET_MAP_FLAGS(op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
1052	update_position(op->map, op->x, op->y);	1009	update_position(op->map, op->x, op->y);
1053	}	1010	}
1054		1011
1055	if(op->more!=NULL)	1012	if(op->more!=NULL)
1056	update_object(op->more, action);	1013	update_object(op->more, action);
1057	}	1014	}
1058		1015
1059		1016
1060	/*	1017	/*
1061	* free_object() frees everything allocated by an object, removes	1018	* free_object() frees everything allocated by an object, removes
…		…
1072	free_object2(ob, 0);	1029	free_object2(ob, 0);
1073	}	1030	}
1074	void free_object2(object *ob, int free_inventory) {	1031	void free_object2(object *ob, int free_inventory) {
1075	object *tmp,*op;	1032	object *tmp,*op;
1076		1033
1077	if (object_free_callback)	1034	ob->clear ();
1078	object_free_callback (ob);
1079		1035
1080	if (!QUERY_FLAG(ob,FLAG_REMOVED)) {	1036	if (!QUERY_FLAG(ob,FLAG_REMOVED)) {
1081	LOG(llevDebug,"Free object called with non removed object\n");	1037	LOG(llevDebug,"Free object called with non removed object\n");
1082	dump_object(ob);	1038	dump_object(ob);
1083	#ifdef MANY_CORES	1039	#ifdef MANY_CORES
1084	abort();	1040	abort();
1085	#endif	1041	#endif
1086	}	1042	}
1087	if(QUERY_FLAG(ob,FLAG_FRIENDLY)) {	1043	if(QUERY_FLAG(ob,FLAG_FRIENDLY)) {
1088	LOG(llevMonster,"Warning: tried to free friendly object.\n");	1044	LOG(llevMonster,"Warning: tried to free friendly object.\n");
1089	remove_friendly_object(ob);	1045	remove_friendly_object(ob);
1090	}	1046	}
1091	if(QUERY_FLAG(ob,FLAG_FREED)) {	1047	if(QUERY_FLAG(ob,FLAG_FREED)) {
1092	dump_object(ob);	1048	dump_object(ob);
1093	LOG(llevError,"Trying to free freed object.\n%s\n",errmsg);	1049	LOG(llevError,"Trying to free freed object.\n%s\n",errmsg);
1094	return;	1050	return;
1095	}	1051	}
1096	if(ob->more!=NULL) {	1052	if(ob->more!=NULL) {
1097	free_object2(ob->more, free_inventory);	1053	free_object2(ob->more, free_inventory);
1098	ob->more=NULL;	1054	ob->more=NULL;
1099	}	1055	}
1100	if (ob->inv) {	1056	if (ob->inv) {
1101	/* Only if the space blocks everything do we not process -	1057	/* Only if the space blocks everything do we not process -
1102	* if some form of movemnt is allowed, let objects	1058	* if some form of movemnt is allowed, let objects
1103	* drop on that space.	1059	* drop on that space.
1104	*/	1060	*/
1105	if (free_inventory || ob->map==NULL || ob->map->in_memory!=MAP_IN_MEMORY ||	1061	if (free_inventory || ob->map==NULL || ob->map->in_memory!=MAP_IN_MEMORY ||
1106	(GET_MAP_MOVE_BLOCK(ob->map, ob->x, ob->y) == MOVE_ALL))	1062	(GET_MAP_MOVE_BLOCK(ob->map, ob->x, ob->y) == MOVE_ALL))
1107	{	1063	{
1108	op=ob->inv;	1064	op=ob->inv;
1109	while(op!=NULL) {	1065	while(op!=NULL) {
1110	tmp=op->below;	1066	tmp=op->below;
1111	remove_ob(op);	1067	remove_ob(op);
1112	free_object2(op, free_inventory);	1068	free_object2(op, free_inventory);
1113	op=tmp;	1069	op=tmp;
1114	}	1070	}
1115	}	1071	}
1116	else { /* Put objects in inventory onto this space */	1072	else { /* Put objects in inventory onto this space */
1117	op=ob->inv;	1073	op=ob->inv;
1118	while(op!=NULL) {	1074	while(op!=NULL) {
1119	tmp=op->below;	1075	tmp=op->below;
1120	remove_ob(op);	1076	remove_ob(op);
1121	if(QUERY_FLAG(op,FLAG_STARTEQUIP)||QUERY_FLAG(op,FLAG_NO_DROP) ||	1077	if(QUERY_FLAG(op,FLAG_STARTEQUIP)||QUERY_FLAG(op,FLAG_NO_DROP) ||
1122	op->type==RUNE || op->type==TRAP || QUERY_FLAG(op,FLAG_IS_A_TEMPLATE))	1078	op->type==RUNE || op->type==TRAP || QUERY_FLAG(op,FLAG_IS_A_TEMPLATE))
1123	free_object(op);	1079	free_object(op);
1124	else {	1080	else {
1125	op->x=ob->x;	1081	op->x=ob->x;
1126	op->y=ob->y;	1082	op->y=ob->y;
1127	insert_ob_in_map(op,ob->map,NULL,0); /* Insert in same map as the envir */	1083	insert_ob_in_map(op,ob->map,NULL,0); /* Insert in same map as the envir */
1128	}	1084	}
1129	op=tmp;	1085	op=tmp;
1130	}	1086	}
1131	}	1087	}
1132	}	1088	}
1133	/* Remove object from the active list */	1089	/* Remove object from the active list */
1134	ob->speed = 0;	1090	ob->speed = 0;
1135	update_ob_speed(ob);	1091	update_ob_speed(ob);
1136		1092
1137	SET_FLAG(ob, FLAG_FREED);	1093	SET_FLAG(ob, FLAG_FREED);
1138	ob->count = 0;	1094	ob->count = 0;
1139		1095
1140	/* Remove this object from the list of used objects */	1096	/* Remove this object from the list of used objects */
1141	if(ob->prev==NULL) {	1097	if(ob->prev==NULL) {
1142	objects=ob->next;	1098	objects=ob->next;
1143	if(objects!=NULL)	1099	if(objects!=NULL)
1144	objects->prev=NULL;	1100	objects->prev=NULL;
1145	}	1101	}
1146	else {	1102	else {
1147	ob->prev->next=ob->next;	1103	ob->prev->next=ob->next;
1148	if(ob->next!=NULL)	1104	if(ob->next!=NULL)
1149	ob->next->prev=ob->prev;	1105	ob->next->prev=ob->prev;
1150	}	1106	}
1151		1107
1152	if(ob->name!=NULL) FREE_AND_CLEAR_STR(ob->name);	1108	if(ob->name!=NULL) FREE_AND_CLEAR_STR(ob->name);
1153	if(ob->name_pl!=NULL) FREE_AND_CLEAR_STR(ob->name_pl);	1109	if(ob->name_pl!=NULL) FREE_AND_CLEAR_STR(ob->name_pl);
1154	if(ob->title!=NULL) FREE_AND_CLEAR_STR(ob->title);	1110	if(ob->title!=NULL) FREE_AND_CLEAR_STR(ob->title);
…		…
1179		1135
1180	/* Now link it with the free_objects list: */	1136	/* Now link it with the free_objects list: */
1181	ob->prev=NULL;	1137	ob->prev=NULL;
1182	ob->next=free_objects;	1138	ob->next=free_objects;
1183	if(free_objects!=NULL)	1139	if(free_objects!=NULL)
1184	free_objects->prev=ob;	1140	free_objects->prev=ob;
1185	free_objects=ob;	1141	free_objects=ob;
1186	nroffreeobjects++;	1142	nroffreeobjects++;
1187	#endif	1143	#endif
1188	}	1144	}
1189		1145
…		…
1255	mapstruct *m;	1211	mapstruct *m;
1256	sint16 x,y;	1212	sint16 x,y;
1257		1213
1258		1214
1259	if(QUERY_FLAG(op,FLAG_REMOVED)) {	1215	if(QUERY_FLAG(op,FLAG_REMOVED)) {
1260	dump_object(op);	1216	dump_object(op);
1261	LOG(llevError,"Trying to remove removed object.\n%s\n",errmsg);	1217	LOG(llevError,"Trying to remove removed object.\n%s\n",errmsg);
1262		1218
1263	/* Changed it to always dump core in this case. As has been learned	1219	/* Changed it to always dump core in this case. As has been learned
1264	* in the past, trying to recover from errors almost always	1220	* in the past, trying to recover from errors almost always
1265	* make things worse, and this is a real error here - something	1221	* make things worse, and this is a real error here - something
1266	* that should not happen.	1222	* that should not happen.
1267	* Yes, if this was a mission critical app, trying to do something	1223	* Yes, if this was a mission critical app, trying to do something
1268	* to recover may make sense, but that is because failure of the app	1224	* to recover may make sense, but that is because failure of the app
1269	* may have other disastrous problems. Cf runs out of a script	1225	* may have other disastrous problems. Cf runs out of a script
1270	* so is easily enough restarted without any real problems.	1226	* so is easily enough restarted without any real problems.
1271	* MSW 2001-07-01	1227	* MSW 2001-07-01
1272	*/	1228	*/
1273	abort();	1229	abort();
1274	}	1230	}
1275	if(op->more!=NULL)	1231	if(op->more!=NULL)
1276	remove_ob(op->more);	1232	remove_ob(op->more);
1277		1233
1278	SET_FLAG(op, FLAG_REMOVED);	1234	SET_FLAG(op, FLAG_REMOVED);
1279		1235
1280	/*	1236	/*
1281	* In this case, the object to be removed is in someones	1237	* In this case, the object to be removed is in someones
1282	* inventory.	1238	* inventory.
1283	*/	1239	*/
1284	if(op->env!=NULL) {	1240	if(op->env!=NULL) {
1285	if(op->nrof)	1241	if(op->nrof)
1286	sub_weight(op->env, op->weight*op->nrof);	1242	sub_weight(op->env, op->weight*op->nrof);
1287	else	1243	else
1288	sub_weight(op->env, op->weight+op->carrying);	1244	sub_weight(op->env, op->weight+op->carrying);
1289		1245
1290	/* NO_FIX_PLAYER is set when a great many changes are being	1246	/* NO_FIX_PLAYER is set when a great many changes are being
1291	* made to players inventory. If set, avoiding the call	1247	* made to players inventory. If set, avoiding the call
1292	* to save cpu time.	1248	* to save cpu time.
1293	*/	1249	*/
1294	if ((otmp=is_player_inv(op->env))!=NULL && otmp->contr &&	1250	if ((otmp=is_player_inv(op->env))!=NULL && otmp->contr &&
1295	!QUERY_FLAG(otmp,FLAG_NO_FIX_PLAYER))	1251	!QUERY_FLAG(otmp,FLAG_NO_FIX_PLAYER))
1296	fix_player(otmp);	1252	fix_player(otmp);
1297		1253
1298	if(op->above!=NULL)	1254	if(op->above!=NULL)
1299	op->above->below=op->below;	1255	op->above->below=op->below;
1300	else	1256	else
1301	op->env->inv=op->below;	1257	op->env->inv=op->below;
1302		1258
1303	if(op->below!=NULL)	1259	if(op->below!=NULL)
1304	op->below->above=op->above;	1260	op->below->above=op->above;
1305		1261
1306	/* we set up values so that it could be inserted into	1262	/* we set up values so that it could be inserted into
1307	* the map, but we don't actually do that - it is up	1263	* the map, but we don't actually do that - it is up
1308	* to the caller to decide what we want to do.	1264	* to the caller to decide what we want to do.
1309	*/	1265	*/
1310	op->x=op->env->x,op->y=op->env->y;	1266	op->x=op->env->x,op->y=op->env->y;
1311	op->ox=op->x,op->oy=op->y;	1267	op->ox=op->x,op->oy=op->y;
1312	op->map=op->env->map;	1268	op->map=op->env->map;
1313	op->above=NULL,op->below=NULL;	1269	op->above=NULL,op->below=NULL;
1314	op->env=NULL;	1270	op->env=NULL;
1315	return;	1271	return;
1316	}	1272	}
1317		1273
1318	/* If we get here, we are removing it from a map */	1274	/* If we get here, we are removing it from a map */
1319	if (op->map == NULL) return;	1275	if (op->map == NULL) return;
1320		1276
1321	x = op->x;	1277	x = op->x;
1322	y = op->y;	1278	y = op->y;
1323	m = get_map_from_coord(op->map, &x, &y);	1279	m = get_map_from_coord(op->map, &x, &y);
1324		1280
1325	if (!m) {	1281	if (!m) {
1326	LOG(llevError,"remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1282	LOG(llevError,"remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1327	op->map->path, op->x, op->y);	1283	op->map->path, op->x, op->y);
1328	/* in old days, we used to set x and y to 0 and continue.	1284	/* in old days, we used to set x and y to 0 and continue.
1329	* it seems if we get into this case, something is probablye	1285	* it seems if we get into this case, something is probablye
1330	* screwed up and should be fixed.	1286	* screwed up and should be fixed.
1331	*/	1287	*/
1332	abort();	1288	abort();
1333	}	1289	}
1334	if (op->map != m) {	1290	if (op->map != m) {
1335	LOG(llevDebug,"remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",	1291	LOG(llevDebug,"remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1336	op->map->path, m->path, op->x, op->y, x, y);	1292	op->map->path, m->path, op->x, op->y, x, y);
1337	}	1293	}
1338		1294
1339	/* Re did the following section of code - it looks like it had	1295	/* Re did the following section of code - it looks like it had
1340	* lots of logic for things we no longer care about	1296	* lots of logic for things we no longer care about
1341	*/	1297	*/
1342		1298
1343	/* link the object above us */	1299	/* link the object above us */
1344	if (op->above)	1300	if (op->above)
1345	op->above->below=op->below;	1301	op->above->below=op->below;
1346	else	1302	else
1347	SET_MAP_TOP(m,x,y,op->below); /* we were top, set new top */	1303	SET_MAP_TOP(m,x,y,op->below); /* we were top, set new top */
1348		1304
1349	/* Relink the object below us, if there is one */	1305	/* Relink the object below us, if there is one */
1350	if(op->below) {	1306	if(op->below) {
1351	op->below->above=op->above;	1307	op->below->above=op->above;
1352	} else {	1308	} else {
1353	/* Nothing below, which means we need to relink map object for this space	1309	/* Nothing below, which means we need to relink map object for this space
1354	* use translated coordinates in case some oddness with map tiling is	1310	* use translated coordinates in case some oddness with map tiling is
1355	* evident	1311	* evident
1356	*/	1312	*/
1357	if(GET_MAP_OB(m,x,y)!=op) {	1313	if(GET_MAP_OB(m,x,y)!=op) {
1358	dump_object(op);	1314	dump_object(op);
1359	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);	1315	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);
1360	dump_object(GET_MAP_OB(m,x,y));	1316	dump_object(GET_MAP_OB(m,x,y));
1361	LOG(llevError,"%s\n",errmsg);	1317	LOG(llevError,"%s\n",errmsg);
1362	}	1318	}
1363	SET_MAP_OB(m,x,y,op->above); /* goes on above it. */	1319	SET_MAP_OB(m,x,y,op->above); /* goes on above it. */
1364	}	1320	}
1365	op->above=NULL;	1321	op->above=NULL;
1366	op->below=NULL;	1322	op->below=NULL;
1367		1323
1368	if (op->map->in_memory == MAP_SAVING)	1324	if (op->map->in_memory == MAP_SAVING)
1369	return;	1325	return;
1370		1326
1371	tag = op->count;	1327	tag = op->count;
1372	check_walk_off = ! QUERY_FLAG (op, FLAG_NO_APPLY);	1328	check_walk_off = ! QUERY_FLAG (op, FLAG_NO_APPLY);
1373	for(tmp=GET_MAP_OB(m,x,y);tmp!=NULL;tmp=tmp->above) {	1329	for(tmp=GET_MAP_OB(m,x,y);tmp!=NULL;tmp=tmp->above) {
1374	/* No point updating the players look faces if he is the object	1330	/* No point updating the players look faces if he is the object
1375	* being removed.	1331	* being removed.
1376	*/	1332	*/
1377		1333
1378	if(tmp->type==PLAYER && tmp!=op) {	1334	if(tmp->type==PLAYER && tmp!=op) {
1379	/* If a container that the player is currently using somehow gets	1335	/* If a container that the player is currently using somehow gets
1380	* removed (most likely destroyed), update the player view	1336	* removed (most likely destroyed), update the player view
1381	* appropriately.	1337	* appropriately.
1382	*/	1338	*/
1383	if (tmp->container==op) {	1339	if (tmp->container==op) {
1384	CLEAR_FLAG(op, FLAG_APPLIED);	1340	CLEAR_FLAG(op, FLAG_APPLIED);
1385	tmp->container=NULL;	1341	tmp->container=NULL;
1386	}	1342	}
1387	tmp->contr->socket.update_look=1;	1343	tmp->contr->socket.update_look=1;
1388	}	1344	}
1389	/* See if player moving off should effect something */	1345	/* See if player moving off should effect something */
1390	if (check_walk_off && ((op->move_type & tmp->move_off) &&	1346	if (check_walk_off && ((op->move_type & tmp->move_off) &&
1391	(op->move_type & ~tmp->move_off & ~tmp->move_block)==0)) {	1347	(op->move_type & ~tmp->move_off & ~tmp->move_block)==0)) {
1392		1348
1393	move_apply(tmp, op, NULL);	1349	move_apply(tmp, op, NULL);
1394	if (was_destroyed (op, tag)) {	1350	if (was_destroyed (op, tag)) {
1395	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed "	1351	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed "
1396	"leaving object\n", tmp->name, tmp->arch->name);	1352	"leaving object\n", tmp->name, tmp->arch->name);
1397	}	1353	}
1398	}	1354	}
1399		1355
1400	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1356	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1401		1357
1402	if(tmp->above == tmp)	1358	if(tmp->above == tmp)
1403	tmp->above = NULL;	1359	tmp->above = NULL;
1404	last=tmp;	1360	last=tmp;
1405	}	1361	}
1406	/* last == NULL of there are no objects on this space */	1362	/* last == NULL of there are no objects on this space */
1407	if (last==NULL) {	1363	if (last==NULL) {
1408	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1364	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1409	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1365	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1410	* those out anyways, and if there are any flags set right now, they won't	1366	* those out anyways, and if there are any flags set right now, they won't
1411	* be correct anyways.	1367	* be correct anyways.
1412	*/	1368	*/
1413	SET_MAP_FLAGS(op->map, op->x, op->y, P_NEED_UPDATE);	1369	SET_MAP_FLAGS(op->map, op->x, op->y, P_NEED_UPDATE);
1414	update_position(op->map, op->x, op->y);	1370	update_position(op->map, op->x, op->y);
1415	}	1371	}
1416	else	1372	else
1417	update_object(last, UP_OBJ_REMOVE);	1373	update_object(last, UP_OBJ_REMOVE);
1418		1374
1419	if(QUERY_FLAG(op,FLAG_BLOCKSVIEW)|| (op->glow_radius != 0))	1375	if(QUERY_FLAG(op,FLAG_BLOCKSVIEW)|| (op->glow_radius != 0))
1420	update_all_los(op->map, op->x, op->y);	1376	update_all_los(op->map, op->x, op->y);
1421		1377
1422	}	1378	}
1423		1379
1424	/*	1380	/*
1425	* merge_ob(op,top):	1381	* merge_ob(op,top):
…		…
1491	{	1447	{
1492	object *tmp, *top, *floor=NULL;	1448	object *tmp, *top, *floor=NULL;
1493	sint16 x,y;	1449	sint16 x,y;
1494		1450
1495	if (QUERY_FLAG (op, FLAG_FREED)) {	1451	if (QUERY_FLAG (op, FLAG_FREED)) {
1496	LOG (llevError, "Trying to insert freed object!\n");	1452	LOG (llevError, "Trying to insert freed object!\n");
1497	return NULL;	1453	return NULL;
1498	}	1454	}
1499	if(m==NULL) {	1455	if(m==NULL) {
1500	dump_object(op);	1456	dump_object(op);
1501	LOG(llevError,"Trying to insert in null-map!\n%s\n",errmsg);	1457	LOG(llevError,"Trying to insert in null-map!\n%s\n",errmsg);
1502	return op;	1458	return op;
1503	}	1459	}
1504	if(out_of_map(m,op->x,op->y)) {	1460	if(out_of_map(m,op->x,op->y)) {
1505	dump_object(op);	1461	dump_object(op);
1506	LOG(llevError,"Trying to insert object outside the map.\n%s\n", errmsg);	1462	LOG(llevError,"Trying to insert object outside the map.\n%s\n", errmsg);
1507	#ifdef MANY_CORES	1463	#ifdef MANY_CORES
1508	/* Better to catch this here, as otherwise the next use of this object	1464	/* Better to catch this here, as otherwise the next use of this object
1509	* is likely to cause a crash. Better to find out where it is getting	1465	* is likely to cause a crash. Better to find out where it is getting
1510	* improperly inserted.	1466	* improperly inserted.
1511	*/	1467	*/
1512	abort();	1468	abort();
1513	#endif	1469	#endif
1514	return op;	1470	return op;
1515	}	1471	}
1516	if(!QUERY_FLAG(op,FLAG_REMOVED)) {	1472	if(!QUERY_FLAG(op,FLAG_REMOVED)) {
1517	dump_object(op);	1473	dump_object(op);
1518	LOG(llevError,"Trying to insert (map) inserted object.\n%s\n", errmsg);	1474	LOG(llevError,"Trying to insert (map) inserted object.\n%s\n", errmsg);
1519	return op;	1475	return op;
1520	}	1476	}
1521	if(op->more!=NULL) {	1477	if(op->more!=NULL) {
1522	/* The part may be on a different map. */	1478	/* The part may be on a different map. */
1523		1479
1524	object *more = op->more;	1480	object *more = op->more;
1525		1481
1526	/* We really need the caller to normalize coordinates - if	1482	/* We really need the caller to normalize coordinates - if
1527	* we set the map, that doesn't work if the location is within	1483	* we set the map, that doesn't work if the location is within
1528	* a map and this is straddling an edge. So only if coordinate	1484	* a map and this is straddling an edge. So only if coordinate
1529	* is clear wrong do we normalize it.	1485	* is clear wrong do we normalize it.
1530	*/	1486	*/
1531	if (OUT_OF_REAL_MAP(more->map, more->x, more->y)) {	1487	if (OUT_OF_REAL_MAP(more->map, more->x, more->y)) {
1532	/* Debugging information so you can see the last coordinates this object had */	1488	/* Debugging information so you can see the last coordinates this object had */
1533	more->ox = more->x;	1489	more->ox = more->x;
1534	more->oy = more->y;	1490	more->oy = more->y;
1535	more->map = get_map_from_coord(m, &more->x, &more->y);	1491	more->map = get_map_from_coord(m, &more->x, &more->y);
1536	} else if (!more->map) {	1492	} else if (!more->map) {
1537	/* For backwards compatibility - when not dealing with tiled maps,	1493	/* For backwards compatibility - when not dealing with tiled maps,
1538	* more->map should always point to the parent.	1494	* more->map should always point to the parent.
1539	*/	1495	*/
1540	more->map = m;	1496	more->map = m;
1541	}	1497	}
1542		1498
1543	if (insert_ob_in_map(more, more->map, originator, flag) == NULL) {	1499	if (insert_ob_in_map(more, more->map, originator, flag) == NULL) {
1544	if ( ! op->head)	1500	if ( ! op->head)
1545	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1501	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1546	return NULL;	1502	return NULL;
1547	}	1503	}
1548	}	1504	}
1549	CLEAR_FLAG(op,FLAG_REMOVED);	1505	CLEAR_FLAG(op,FLAG_REMOVED);
1550		1506
1551	/* Debugging information so you can see the last coordinates this object had */	1507	/* Debugging information so you can see the last coordinates this object had */
1552	op->ox=op->x;	1508	op->ox=op->x;
…		…
1561	y = op->y;	1517	y = op->y;
1562		1518
1563	/* this has to be done after we translate the coordinates.	1519	/* this has to be done after we translate the coordinates.
1564	*/	1520	*/
1565	if(op->nrof && !(flag & INS_NO_MERGE)) {	1521	if(op->nrof && !(flag & INS_NO_MERGE)) {
1566	for(tmp=GET_MAP_OB(op->map,x,y);tmp!=NULL;tmp=tmp->above)	1522	for(tmp=GET_MAP_OB(op->map,x,y);tmp!=NULL;tmp=tmp->above)
1567	if (CAN_MERGE(op,tmp)) {	1523	if (CAN_MERGE(op,tmp)) {
1568	op->nrof+=tmp->nrof;	1524	op->nrof+=tmp->nrof;
1569	remove_ob(tmp);	1525	remove_ob(tmp);
1570	free_object(tmp);	1526	free_object(tmp);
1571	}	1527	}
1572	}	1528	}
1573		1529
1574	CLEAR_FLAG(op,FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1530	CLEAR_FLAG(op,FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1575	CLEAR_FLAG(op, FLAG_INV_LOCKED);	1531	CLEAR_FLAG(op, FLAG_INV_LOCKED);
1576	if (!QUERY_FLAG(op, FLAG_ALIVE))	1532	if (!QUERY_FLAG(op, FLAG_ALIVE))
1577	CLEAR_FLAG(op, FLAG_NO_STEAL);	1533	CLEAR_FLAG(op, FLAG_NO_STEAL);
1578		1534
1579	if (flag & INS_BELOW_ORIGINATOR) {	1535	if (flag & INS_BELOW_ORIGINATOR) {
1580	if (originator->map != op->map || originator->x != op->x ||	1536	if (originator->map != op->map || originator->x != op->x ||
1581	originator->y != op->y) {	1537	originator->y != op->y) {
1582	LOG(llevError,"insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1538	LOG(llevError,"insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1583	abort();	1539	abort();
1584	}	1540	}
1585	op->above = originator;	1541	op->above = originator;
1586	op->below = originator->below;	1542	op->below = originator->below;
1587	if (op->below) op->below->above = op;	1543	if (op->below) op->below->above = op;
1588	else SET_MAP_OB(op->map, op->x, op->y, op);	1544	else SET_MAP_OB(op->map, op->x, op->y, op);
1589	/* since *below* originator, no need to update top */	1545	/* since *below* originator, no need to update top */
1590	originator->below = op;	1546	originator->below = op;
1591	} else {	1547	} else {
1592	/* If there are other objects, then */	1548	/* If there are other objects, then */
1593	if((! (flag & INS_MAP_LOAD)) && ((top=GET_MAP_OB(op->map,op->x,op->y))!=NULL)) {	1549	if((! (flag & INS_MAP_LOAD)) && ((top=GET_MAP_OB(op->map,op->x,op->y))!=NULL)) {
1594	object *last=NULL;	1550	object *last=NULL;
1595	/*	1551	/*
1596	* If there are multiple objects on this space, we do some trickier handling.	1552	* If there are multiple objects on this space, we do some trickier handling.
1597	* We've already dealt with merging if appropriate.	1553	* We've already dealt with merging if appropriate.
1598	* Generally, we want to put the new object on top. But if	1554	* Generally, we want to put the new object on top. But if
1599	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1555	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1600	* floor, we want to insert above that and no further.	1556	* floor, we want to insert above that and no further.
1601	* Also, if there are spell objects on this space, we stop processing	1557	* Also, if there are spell objects on this space, we stop processing
1602	* once we get to them. This reduces the need to traverse over all of	1558	* once we get to them. This reduces the need to traverse over all of
1603	* them when adding another one - this saves quite a bit of cpu time	1559	* them when adding another one - this saves quite a bit of cpu time
1604	* when lots of spells are cast in one area. Currently, it is presumed	1560	* when lots of spells are cast in one area. Currently, it is presumed
1605	* that flying non pickable objects are spell objects.	1561	* that flying non pickable objects are spell objects.
1606	*/	1562	*/
1607		1563
1608	while (top != NULL) {	1564	while (top != NULL) {
1609	if (QUERY_FLAG(top, FLAG_IS_FLOOR) ||	1565	if (QUERY_FLAG(top, FLAG_IS_FLOOR) ||
1610	QUERY_FLAG(top, FLAG_OVERLAY_FLOOR)) floor = top;	1566	QUERY_FLAG(top, FLAG_OVERLAY_FLOOR)) floor = top;
1611	if (QUERY_FLAG(top, FLAG_NO_PICK)	1567	if (QUERY_FLAG(top, FLAG_NO_PICK)
1612	&& (top->move_type & (MOVE_FLY_LOW |MOVE_FLY_HIGH))	1568	&& (top->move_type & (MOVE_FLY_LOW |MOVE_FLY_HIGH))
1613	&& !QUERY_FLAG(top, FLAG_IS_FLOOR))	1569	&& !QUERY_FLAG(top, FLAG_IS_FLOOR))
1614	{	1570	{
1615	/* We insert above top, so we want this object below this */	1571	/* We insert above top, so we want this object below this */
1616	top=top->below;	1572	top=top->below;
1617	break;	1573	break;
1618	}	1574	}
1619	last = top;	1575	last = top;
1620	top = top->above;	1576	top = top->above;
1621	}	1577	}
1622	/* Don't want top to be NULL, so set it to the last valid object */	1578	/* Don't want top to be NULL, so set it to the last valid object */
1623	top = last;	1579	top = last;
1624		1580
1625	/* We let update_position deal with figuring out what the space	1581	/* We let update_position deal with figuring out what the space
1626	* looks like instead of lots of conditions here.	1582	* looks like instead of lots of conditions here.
1627	* makes things faster, and effectively the same result.	1583	* makes things faster, and effectively the same result.
1628	*/	1584	*/
1629		1585
1630	/* Have object 'fall below' other objects that block view.	1586	/* Have object 'fall below' other objects that block view.
1631	* Unless those objects are exits, type 66	1587	* Unless those objects are exits, type 66
1632	* If INS_ON_TOP is used, don't do this processing	1588	* If INS_ON_TOP is used, don't do this processing
1633	* Need to find the object that in fact blocks view, otherwise	1589	* Need to find the object that in fact blocks view, otherwise
1634	* stacking is a bit odd.	1590	* stacking is a bit odd.
1635	*/	1591	*/
1636	if (!(flag & INS_ON_TOP) &&	1592	if (!(flag & INS_ON_TOP) &&
1637	(get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) &&	1593	(get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) &&
1638	(op->face && !op->face->visibility)) {	1594	(op->face && !op->face->visibility)) {
1639	for (last=top; last != floor; last=last->below)	1595	for (last=top; last != floor; last=last->below)
1640	if (QUERY_FLAG(last, FLAG_BLOCKSVIEW)&&(last->type != EXIT)) break;	1596	if (QUERY_FLAG(last, FLAG_BLOCKSVIEW)&&(last->type != EXIT)) break;
1641	/* Check to see if we found the object that blocks view,	1597	/* Check to see if we found the object that blocks view,
1642	* and make sure we have a below pointer for it so that	1598	* and make sure we have a below pointer for it so that
1643	* we can get inserted below this one, which requires we	1599	* we can get inserted below this one, which requires we
1644	* set top to the object below us.	1600	* set top to the object below us.
1645	*/	1601	*/
1646	if (last && last->below && last != floor) top=last->below;	1602	if (last && last->below && last != floor) top=last->below;
1647	}	1603	}
1648	} /* If objects on this space */	1604	} /* If objects on this space */
1649	if (flag & INS_MAP_LOAD)	1605	if (flag & INS_MAP_LOAD)
1650	top = GET_MAP_TOP(op->map,op->x,op->y);	1606	top = GET_MAP_TOP(op->map,op->x,op->y);
1651	if (flag & INS_ABOVE_FLOOR_ONLY) top = floor;	1607	if (flag & INS_ABOVE_FLOOR_ONLY) top = floor;
1652		1608
1653	/* Top is the object that our object (op) is going to get inserted above.	1609	/* Top is the object that our object (op) is going to get inserted above.
1654	*/	1610	*/
1655		1611
1656	/* First object on this space */	1612	/* First object on this space */
1657	if (!top) {	1613	if (!top) {
1658	op->above = GET_MAP_OB(op->map, op->x, op->y);	1614	op->above = GET_MAP_OB(op->map, op->x, op->y);
1659	if (op->above) op->above->below = op;	1615	if (op->above) op->above->below = op;
1660	op->below = NULL;	1616	op->below = NULL;
1661	SET_MAP_OB(op->map, op->x, op->y, op);	1617	SET_MAP_OB(op->map, op->x, op->y, op);
1662	} else { /* get inserted into the stack above top */	1618	} else { /* get inserted into the stack above top */
1663	op->above = top->above;	1619	op->above = top->above;
1664	if (op->above) op->above->below = op;	1620	if (op->above) op->above->below = op;
1665	op->below = top;	1621	op->below = top;
1666	top->above = op;	1622	top->above = op;
1667	}	1623	}
1668	if (op->above==NULL)	1624	if (op->above==NULL)
1669	SET_MAP_TOP(op->map,op->x, op->y, op);	1625	SET_MAP_TOP(op->map,op->x, op->y, op);
1670	} /* else not INS_BELOW_ORIGINATOR */	1626	} /* else not INS_BELOW_ORIGINATOR */
1671		1627
1672	if(op->type==PLAYER)	1628	if(op->type==PLAYER)
1673	op->contr->do_los=1;	1629	op->contr->do_los=1;
1674		1630
1675	/* If we have a floor, we know the player, if any, will be above	1631	/* If we have a floor, we know the player, if any, will be above
1676	* it, so save a few ticks and start from there.	1632	* it, so save a few ticks and start from there.
1677	*/	1633	*/
1678	if (!(flag & INS_MAP_LOAD))	1634	if (!(flag & INS_MAP_LOAD))
1679	for(tmp=floor?floor:GET_MAP_OB(op->map,op->x,op->y);tmp!=NULL;tmp=tmp->above) {	1635	for(tmp=floor?floor:GET_MAP_OB(op->map,op->x,op->y);tmp!=NULL;tmp=tmp->above) {
1680	if (tmp->type == PLAYER)	1636	if (tmp->type == PLAYER)
1681	tmp->contr->socket.update_look=1;	1637	tmp->contr->socket.update_look=1;
1682	}	1638	}
1683		1639
1684	/* If this object glows, it may affect lighting conditions that are	1640	/* If this object glows, it may affect lighting conditions that are
1685	* visible to others on this map. But update_all_los is really	1641	* visible to others on this map. But update_all_los is really
1686	* an inefficient way to do this, as it means los for all players	1642	* an inefficient way to do this, as it means los for all players
…		…
1689	* this should get redone to only look for players within range,	1645	* this should get redone to only look for players within range,
1690	* or just updating the P_NEED_UPDATE for spaces within this area	1646	* or just updating the P_NEED_UPDATE for spaces within this area
1691	* of effect may be sufficient.	1647	* of effect may be sufficient.
1692	*/	1648	*/
1693	if(MAP_DARKNESS(op->map) && (op->glow_radius != 0))	1649	if(MAP_DARKNESS(op->map) && (op->glow_radius != 0))
1694	update_all_los(op->map, op->x, op->y);	1650	update_all_los(op->map, op->x, op->y);
1695		1651
1696		1652
1697	/* updates flags (blocked, alive, no magic, etc) for this map space */	1653	/* updates flags (blocked, alive, no magic, etc) for this map space */
1698	update_object(op,UP_OBJ_INSERT);	1654	update_object(op,UP_OBJ_INSERT);
1699		1655
…		…
1709		1665
1710	/* if this is not the head or flag has been passed, don't check walk on status */	1666	/* if this is not the head or flag has been passed, don't check walk on status */
1711		1667
1712	if (!(flag & INS_NO_WALK_ON) && !op->head) {	1668	if (!(flag & INS_NO_WALK_ON) && !op->head) {
1713	if (check_move_on(op, originator))	1669	if (check_move_on(op, originator))
1714	return NULL;	1670	return NULL;
1715		1671
1716	/* If we are a multi part object, lets work our way through the check	1672	/* If we are a multi part object, lets work our way through the check
1717	* walk on's.	1673	* walk on's.
1718	*/	1674	*/
1719	for (tmp=op->more; tmp!=NULL; tmp=tmp->more)	1675	for (tmp=op->more; tmp!=NULL; tmp=tmp->more)
1720	if (check_move_on (tmp, originator))	1676	if (check_move_on (tmp, originator))
1721	return NULL;	1677	return NULL;
1722	}	1678	}
1723	return op;	1679	return op;
1724	}	1680	}
1725		1681
1726	/* this function inserts an object in the map, but if it	1682	/* this function inserts an object in the map, but if it
…		…
1732	object *tmp1;	1688	object *tmp1;
1733		1689
1734	/* first search for itself and remove any old instances */	1690	/* first search for itself and remove any old instances */
1735		1691
1736	for(tmp=GET_MAP_OB(op->map,op->x,op->y); tmp!=NULL; tmp=tmp->above) {	1692	for(tmp=GET_MAP_OB(op->map,op->x,op->y); tmp!=NULL; tmp=tmp->above) {
1737	if(!strcmp(tmp->arch->name,arch_string)) /* same archetype */ {	1693	if(!strcmp(tmp->arch->name,arch_string)) /* same archetype */ {
1738	remove_ob(tmp);	1694	remove_ob(tmp);
1739	free_object(tmp);	1695	free_object(tmp);
1740	}	1696	}
1741	}	1697	}
1742		1698
1743	tmp1=arch_to_object(find_archetype(arch_string));	1699	tmp1=arch_to_object(find_archetype(arch_string));
1744		1700
1745		1701
…		…
1758	object *get_split_ob(object *orig_ob, uint32 nr) {	1714	object *get_split_ob(object *orig_ob, uint32 nr) {
1759	object *newob;	1715	object *newob;
1760	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1716	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1761		1717
1762	if(orig_ob->nrof<nr) {	1718	if(orig_ob->nrof<nr) {
1763	sprintf(errmsg,"There are only %d %ss.",	1719	sprintf(errmsg,"There are only %d %ss.",
1764	orig_ob->nrof?orig_ob->nrof:1, orig_ob->name);	1720	orig_ob->nrof?orig_ob->nrof:1, orig_ob->name);
1765	return NULL;	1721	return NULL;
1766	}	1722	}
1767	newob = object_create_clone(orig_ob);	1723	newob = object_create_clone(orig_ob);
1768	if((orig_ob->nrof-=nr)<1) {	1724	if((orig_ob->nrof-=nr)<1) {
1769	if ( ! is_removed)	1725	if ( ! is_removed)
1770	remove_ob(orig_ob);	1726	remove_ob(orig_ob);
1771	free_object2(orig_ob, 1);	1727	free_object2(orig_ob, 1);
1772	}	1728	}
1773	else if ( ! is_removed) {	1729	else if ( ! is_removed) {
1774	if(orig_ob->env!=NULL)	1730	if(orig_ob->env!=NULL)
1775	sub_weight (orig_ob->env,orig_ob->weight*nr);	1731	sub_weight (orig_ob->env,orig_ob->weight*nr);
1776	if (orig_ob->env == NULL && orig_ob->map->in_memory!=MAP_IN_MEMORY) {	1732	if (orig_ob->env == NULL && orig_ob->map->in_memory!=MAP_IN_MEMORY) {
1777	strcpy(errmsg, "Tried to split object whose map is not in memory.");	1733	strcpy(errmsg, "Tried to split object whose map is not in memory.");
1778	LOG(llevDebug,	1734	LOG(llevDebug,
1779	"Error, Tried to split object whose map is not in memory.\n");	1735	"Error, Tried to split object whose map is not in memory.\n");
1780	return NULL;	1736	return NULL;
1781	}	1737	}
1782	}	1738	}
1783	newob->nrof=nr;	1739	newob->nrof=nr;
1784		1740
1785	return newob;	1741	return newob;
1786	}	1742	}
…		…
1808	{	1764	{
1809	op->nrof -= i;	1765	op->nrof -= i;
1810	}	1766	}
1811	else if (op->env != NULL)	1767	else if (op->env != NULL)
1812	{	1768	{
1813	/* is this object in the players inventory, or sub container	1769	/* is this object in the players inventory, or sub container
1814	* therein?	1770	* therein?
1815	*/	1771	*/
1816	tmp = is_player_inv (op->env);	1772	tmp = is_player_inv (op->env);
1817	/* nope. Is this a container the player has opened?	1773	/* nope. Is this a container the player has opened?
1818	* If so, set tmp to that player.	1774	* If so, set tmp to that player.
1819	* IMO, searching through all the players will mostly	1775	* IMO, searching through all the players will mostly
1820	* likely be quicker than following op->env to the map,	1776	* likely be quicker than following op->env to the map,
1821	* and then searching the map for a player.	1777	* and then searching the map for a player.
1822	*/	1778	*/
1823	if (!tmp) {	1779	if (!tmp) {
1824	for (pl=first_player; pl; pl=pl->next)	1780	for (pl=first_player; pl; pl=pl->next)
1825	if (pl->ob->container == op->env) break;	1781	if (pl->ob->container == op->env) break;
1826	if (pl) tmp=pl->ob;	1782	if (pl) tmp=pl->ob;
1827	else tmp=NULL;	1783	else tmp=NULL;
1828	}	1784	}
1829		1785
1830	if (i < op->nrof) {	1786	if (i < op->nrof) {
1831	sub_weight (op->env, op->weight * i);	1787	sub_weight (op->env, op->weight * i);
1832	op->nrof -= i;	1788	op->nrof -= i;
1833	if (tmp) {	1789	if (tmp) {
…		…
1841	}	1797	}
1842	}	1798	}
1843	}	1799	}
1844	else	1800	else
1845	{	1801	{
1846	object *above = op->above;	1802	object *above = op->above;
1847		1803
1848	if (i < op->nrof) {	1804	if (i < op->nrof) {
1849	op->nrof -= i;	1805	op->nrof -= i;
1850	} else {	1806	} else {
1851	remove_ob (op);	1807	remove_ob (op);
1852	op->nrof = 0;	1808	op->nrof = 0;
1853	}	1809	}
1854	/* Since we just removed op, op->above is null */	1810	/* Since we just removed op, op->above is null */
1855	for (tmp = above; tmp != NULL; tmp = tmp->above)	1811	for (tmp = above; tmp != NULL; tmp = tmp->above)
1856	if (tmp->type == PLAYER) {	1812	if (tmp->type == PLAYER) {
1857	if (op->nrof)	1813	if (op->nrof)
1858	esrv_send_item(tmp, op);	1814	esrv_send_item(tmp, op);
1859	else	1815	else
…		…
1911	LOG(llevError,"Trying to put object in NULL.\n%s\n", errmsg);	1867	LOG(llevError,"Trying to put object in NULL.\n%s\n", errmsg);
1912	return op;	1868	return op;
1913	}	1869	}
1914	if (where->head) {	1870	if (where->head) {
1915	LOG(llevDebug,	1871	LOG(llevDebug,
1916	"Warning: Tried to insert object wrong part of multipart object.\n");	1872	"Warning: Tried to insert object wrong part of multipart object.\n");
1917	where = where->head;	1873	where = where->head;
1918	}	1874	}
1919	if (op->more) {	1875	if (op->more) {
1920	LOG(llevError, "Tried to insert multipart object %s (%d)\n",	1876	LOG(llevError, "Tried to insert multipart object %s (%d)\n",
1921	op->name, op->count);	1877	op->name, op->count);
…		…
1924	CLEAR_FLAG(op, FLAG_OBJ_ORIGINAL);	1880	CLEAR_FLAG(op, FLAG_OBJ_ORIGINAL);
1925	CLEAR_FLAG(op, FLAG_REMOVED);	1881	CLEAR_FLAG(op, FLAG_REMOVED);
1926	if(op->nrof) {	1882	if(op->nrof) {
1927	for(tmp=where->inv;tmp!=NULL;tmp=tmp->below)	1883	for(tmp=where->inv;tmp!=NULL;tmp=tmp->below)
1928	if ( CAN_MERGE(tmp,op) ) {	1884	if ( CAN_MERGE(tmp,op) ) {
1929	/* return the original object and remove inserted object	1885	/* return the original object and remove inserted object
1930	(client needs the original object) */	1886	(client needs the original object) */
1931	tmp->nrof += op->nrof;	1887	tmp->nrof += op->nrof;
1932	/* Weight handling gets pretty funky. Since we are adding to	1888	/* Weight handling gets pretty funky. Since we are adding to
1933	* tmp->nrof, we need to increase the weight.	1889	* tmp->nrof, we need to increase the weight.
1934	*/	1890	*/
1935	add_weight (where, op->weight*op->nrof);	1891	add_weight (where, op->weight*op->nrof);
1936	SET_FLAG(op, FLAG_REMOVED);	1892	SET_FLAG(op, FLAG_REMOVED);
1937	free_object(op); /* free the inserted object */	1893	free_object(op); /* free the inserted object */
1938	op = tmp;	1894	op = tmp;
1939	remove_ob (op); /* and fix old object's links */	1895	remove_ob (op); /* and fix old object's links */
1940	CLEAR_FLAG(op, FLAG_REMOVED);	1896	CLEAR_FLAG(op, FLAG_REMOVED);
1941	break;	1897	break;
1942	}	1898	}
1943		1899
1944	/* I assume combined objects have no inventory	1900	/* I assume combined objects have no inventory
1945	* We add the weight - this object could have just been removed	1901	* We add the weight - this object could have just been removed
1946	* (if it was possible to merge). calling remove_ob will subtract	1902	* (if it was possible to merge). calling remove_ob will subtract
…		…
1967	/* reset the light list and los of the players on the map */	1923	/* reset the light list and los of the players on the map */
1968	if((op->glow_radius!=0)&&where->map)	1924	if((op->glow_radius!=0)&&where->map)
1969	{	1925	{
1970	#ifdef DEBUG_LIGHTS	1926	#ifdef DEBUG_LIGHTS
1971	LOG(llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n",	1927	LOG(llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n",
1972	op->name);	1928	op->name);
1973	#endif /* DEBUG_LIGHTS */	1929	#endif /* DEBUG_LIGHTS */
1974	if (MAP_DARKNESS(where->map)) update_all_los(where->map, where->x, where->y);	1930	if (MAP_DARKNESS(where->map)) update_all_los(where->map, where->x, where->y);
1975	}	1931	}
1976		1932
1977	/* Client has no idea of ordering so lets not bother ordering it here.	1933	/* Client has no idea of ordering so lets not bother ordering it here.
…		…
2015	mapstruct *m=op->map;	1971	mapstruct *m=op->map;
2016	int x=op->x, y=op->y;	1972	int x=op->x, y=op->y;
2017	MoveType move_on, move_slow, move_block;	1973	MoveType move_on, move_slow, move_block;
2018		1974
2019	if(QUERY_FLAG(op,FLAG_NO_APPLY))	1975	if(QUERY_FLAG(op,FLAG_NO_APPLY))
2020	return 0;	1976	return 0;
2021		1977
2022	tag = op->count;	1978	tag = op->count;
2023		1979
2024	move_on = GET_MAP_MOVE_ON(op->map, op->x, op->y);	1980	move_on = GET_MAP_MOVE_ON(op->map, op->x, op->y);
2025	move_slow = GET_MAP_MOVE_SLOW(op->map, op->x, op->y);	1981	move_slow = GET_MAP_MOVE_SLOW(op->map, op->x, op->y);
…		…
2029	* no need to do checking below. have to make sure move_type	1985	* no need to do checking below. have to make sure move_type
2030	* is set, as lots of objects don't have it set - we treat that	1986	* is set, as lots of objects don't have it set - we treat that
2031	* as walking.	1987	* as walking.
2032	*/	1988	*/
2033	if (op->move_type && !(op->move_type & move_on) && !(op->move_type & move_slow))	1989	if (op->move_type && !(op->move_type & move_on) && !(op->move_type & move_slow))
2034	return 0;	1990	return 0;
2035		1991
2036	/* This is basically inverse logic of that below - basically,	1992	/* This is basically inverse logic of that below - basically,
2037	* if the object can avoid the move on or slow move, they do so,	1993	* if the object can avoid the move on or slow move, they do so,
2038	* but can't do it if the alternate movement they are using is	1994	* but can't do it if the alternate movement they are using is
2039	* blocked. Logic on this seems confusing, but does seem correct.	1995	* blocked. Logic on this seems confusing, but does seem correct.
2040	*/	1996	*/
2041	if ((op->move_type & ~move_on & ~move_block) != 0 &&	1997	if ((op->move_type & ~move_on & ~move_block) != 0 &&
2042	(op->move_type & ~move_slow & ~move_block) != 0) return 0;	1998	(op->move_type & ~move_slow & ~move_block) != 0) return 0;
2043		1999
2044	/* The objects have to be checked from top to bottom.	2000	/* The objects have to be checked from top to bottom.
2045	* Hence, we first go to the top:	2001	* Hence, we first go to the top:
2046	*/	2002	*/
2047		2003
2048	for (tmp=GET_MAP_OB(op->map, op->x, op->y); tmp!=NULL &&	2004	for (tmp=GET_MAP_OB(op->map, op->x, op->y); tmp!=NULL &&
2049	tmp->above!=NULL; tmp=tmp->above) {	2005	tmp->above!=NULL; tmp=tmp->above) {
2050	/* Trim the search when we find the first other spell effect	2006	/* Trim the search when we find the first other spell effect
2051	* this helps performance so that if a space has 50 spell objects,	2007	* this helps performance so that if a space has 50 spell objects,
2052	* we don't need to check all of them.	2008	* we don't need to check all of them.
2053	*/	2009	*/
2054	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG(tmp, FLAG_NO_PICK)) break;	2010	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG(tmp, FLAG_NO_PICK)) break;
2055	}	2011	}
2056	for(;tmp!=NULL; tmp=tmp->below) {	2012	for(;tmp!=NULL; tmp=tmp->below) {
2057	if (tmp == op) continue; /* Can't apply yourself */	2013	if (tmp == op) continue; /* Can't apply yourself */
2058		2014
2059	/* Check to see if one of the movement types should be slowed down.	2015	/* Check to see if one of the movement types should be slowed down.
2060	* Second check makes sure that the movement types not being slowed	2016	* Second check makes sure that the movement types not being slowed
2061	* (~slow_move) is not blocked on this space - just because the	2017	* (~slow_move) is not blocked on this space - just because the
2062	* space doesn't slow down swimming (for example), if you can't actually	2018	* space doesn't slow down swimming (for example), if you can't actually
2063	* swim on that space, can't use it to avoid the penalty.	2019	* swim on that space, can't use it to avoid the penalty.
2064	*/	2020	*/
2065	if (!QUERY_FLAG(op, FLAG_WIZPASS)) {	2021	if (!QUERY_FLAG(op, FLAG_WIZPASS)) {
2066	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	2022	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2067	((op->move_type & tmp->move_slow) &&	2023	((op->move_type & tmp->move_slow) &&
2068	(op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) {	2024	(op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) {
2069		2025
2070	float diff;	2026	float diff;
2071		2027
2072	diff = tmp->move_slow_penalty*FABS(op->speed);	2028	diff = tmp->move_slow_penalty*FABS(op->speed);
2073	if (op->type == PLAYER) {	2029	if (op->type == PLAYER) {
2074	if ((QUERY_FLAG(tmp, FLAG_IS_HILLY) && find_skill_by_number(op, SK_CLIMBING)) ||	2030	if ((QUERY_FLAG(tmp, FLAG_IS_HILLY) && find_skill_by_number(op, SK_CLIMBING)) ||
2075	(QUERY_FLAG(tmp, FLAG_IS_WOODED) && find_skill_by_number(op, SK_WOODSMAN))) {	2031	(QUERY_FLAG(tmp, FLAG_IS_WOODED) && find_skill_by_number(op, SK_WOODSMAN))) {
2076	diff /= 4.0;	2032	diff /= 4.0;
2077	}	2033	}
2078	}	2034	}
2079	op->speed_left -= diff;	2035	op->speed_left -= diff;
2080	}	2036	}
2081	}	2037	}
2082		2038
2083	/* Basically same logic as above, except now for actual apply. */	2039	/* Basically same logic as above, except now for actual apply. */
2084	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	2040	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2085	((op->move_type & tmp->move_on) &&	2041	((op->move_type & tmp->move_on) &&
2086	(op->move_type & ~tmp->move_on & ~tmp->move_block)==0)) {	2042	(op->move_type & ~tmp->move_on & ~tmp->move_block)==0)) {
2087		2043
2088	move_apply(tmp, op, originator);	2044	move_apply(tmp, op, originator);
2089	if (was_destroyed (op, tag))	2045	if (was_destroyed (op, tag))
2090	return 1;	2046	return 1;
2091		2047
2092	/* what the person/creature stepped onto has moved the object	2048	/* what the person/creature stepped onto has moved the object
2093	* someplace new. Don't process any further - if we did,	2049	* someplace new. Don't process any further - if we did,
2094	* have a feeling strange problems would result.	2050	* have a feeling strange problems would result.
2095	*/	2051	*/
2096	if (op->map != m || op->x != x || op->y != y) return 0;	2052	if (op->map != m || op->x != x || op->y != y) return 0;
2097	}	2053	}
2098	}	2054	}
2099	return 0;	2055	return 0;
2100	}	2056	}
2101		2057
2102	/*	2058	/*
…		…
2166		2122
2167	object *present_in_ob_by_name(int type, const char *str, const object *op) {	2123	object *present_in_ob_by_name(int type, const char *str, const object *op) {
2168	object *tmp;	2124	object *tmp;
2169		2125
2170	for(tmp=op->inv; tmp!=NULL; tmp=tmp->below) {	2126	for(tmp=op->inv; tmp!=NULL; tmp=tmp->below) {
2171	if ((type==-1 || tmp->type==type) && (!strcmp(str, tmp->name)))	2127	if ((type==-1 || tmp->type==type) && (!strcmp(str, tmp->name)))
2172	return tmp;	2128	return tmp;
2173	}	2129	}
2174	return NULL;	2130	return NULL;
2175	}	2131	}
2176		2132
2177	/*	2133	/*
…		…
2247	int find_free_spot(const object *ob, mapstruct *m,int x,int y,int start,int stop) {	2203	int find_free_spot(const object *ob, mapstruct *m,int x,int y,int start,int stop) {
2248	int i,index=0, flag;	2204	int i,index=0, flag;
2249	static int altern[SIZEOFFREE];	2205	static int altern[SIZEOFFREE];
2250		2206
2251	for(i=start;i<stop;i++) {	2207	for(i=start;i<stop;i++) {
2252	flag = ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i]);	2208	flag = ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i]);
2253	if(!flag)	2209	if(!flag)
2254	altern[index++]=i;	2210	altern[index++]=i;
2255		2211
2256	/* Basically, if we find a wall on a space, we cut down the search size.	2212	/* Basically, if we find a wall on a space, we cut down the search size.
2257	* In this way, we won't return spaces that are on another side of a wall.	2213	* In this way, we won't return spaces that are on another side of a wall.
2258	* This mostly work, but it cuts down the search size in all directions -	2214	* This mostly work, but it cuts down the search size in all directions -
2259	* if the space being examined only has a wall to the north and empty	2215	* if the space being examined only has a wall to the north and empty
2260	* spaces in all the other directions, this will reduce the search space	2216	* spaces in all the other directions, this will reduce the search space
2261	* to only the spaces immediately surrounding the target area, and	2217	* to only the spaces immediately surrounding the target area, and
2262	* won't look 2 spaces south of the target space.	2218	* won't look 2 spaces south of the target space.
2263	*/	2219	*/
2264	else if ((flag & AB_NO_PASS) && maxfree[i]<stop)	2220	else if ((flag & AB_NO_PASS) && maxfree[i]<stop)
2265	stop=maxfree[i];	2221	stop=maxfree[i];
2266	}	2222	}
2267	if(!index) return -1;	2223	if(!index) return -1;
2268	return altern[RANDOM()%index];	2224	return altern[RANDOM()%index];
2269	}	2225	}
2270		2226
…		…
2276	*/	2232	*/
2277		2233
2278	int find_first_free_spot(const object *ob, mapstruct *m,int x,int y) {	2234	int find_first_free_spot(const object *ob, mapstruct *m,int x,int y) {
2279	int i;	2235	int i;
2280	for(i=0;i<SIZEOFFREE;i++) {	2236	for(i=0;i<SIZEOFFREE;i++) {
2281	if(!ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i]))	2237	if(!ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i]))
2282	return i;	2238	return i;
2283	}	2239	}
2284	return -1;	2240	return -1;
2285	}	2241	}
2286		2242
2287	/*	2243	/*
…		…
2293	int i, j, tmp, len;	2249	int i, j, tmp, len;
2294		2250
2295	len = end-begin;	2251	len = end-begin;
2296	for(i = begin; i < end; i++)	2252	for(i = begin; i < end; i++)
2297	{	2253	{
2298	j = begin+RANDOM()%len;	2254	j = begin+RANDOM()%len;
2299		2255
2300	tmp = arr[i];	2256	tmp = arr[i];
2301	arr[i] = arr[j];	2257	arr[i] = arr[j];
2302	arr[j] = tmp;	2258	arr[j] = tmp;
2303	}	2259	}
2304	}	2260	}
2305		2261
2306	/* new function to make monster searching more efficient, and effective!	2262	/* new function to make monster searching more efficient, and effective!
2307	* This basically returns a randomized array (in the passed pointer) of	2263	* This basically returns a randomized array (in the passed pointer) of
…		…
2314	{	2270	{
2315	int i;	2271	int i;
2316		2272
2317	for(i = 0; i < SIZEOFFREE; i++)	2273	for(i = 0; i < SIZEOFFREE; i++)
2318	{	2274	{
2319	search_arr[i] = i;	2275	search_arr[i] = i;
2320	}	2276	}
2321		2277
2322	permute(search_arr, 1, SIZEOFFREE1+1);	2278	permute(search_arr, 1, SIZEOFFREE1+1);
2323	permute(search_arr, SIZEOFFREE1+1, SIZEOFFREE2+1);	2279	permute(search_arr, SIZEOFFREE1+1, SIZEOFFREE2+1);
2324	permute(search_arr, SIZEOFFREE2+1, SIZEOFFREE);	2280	permute(search_arr, SIZEOFFREE2+1, SIZEOFFREE);
…		…
2343	object *tmp;	2299	object *tmp;
2344	mapstruct *mp;	2300	mapstruct *mp;
2345	MoveType blocked, move_type;	2301	MoveType blocked, move_type;
2346		2302
2347	if (exclude && exclude->head) {	2303	if (exclude && exclude->head) {
2348	exclude = exclude->head;	2304	exclude = exclude->head;
2349	move_type = exclude->move_type;	2305	move_type = exclude->move_type;
2350	} else {	2306	} else {
2351	/* If we don't have anything, presume it can use all movement types. */	2307	/* If we don't have anything, presume it can use all movement types. */
2352	move_type=MOVE_ALL;	2308	move_type=MOVE_ALL;
2353	}	2309	}
2354		2310
2355	for(i=1;i<max;i++) {	2311	for(i=1;i<max;i++) {
2356	mp = m;	2312	mp = m;
2357	nx = x + freearr_x[i];	2313	nx = x + freearr_x[i];
2358	ny = y + freearr_y[i];	2314	ny = y + freearr_y[i];
2359		2315
2360	mflags = get_map_flags(m, &mp, nx, ny, &nx, &ny);	2316	mflags = get_map_flags(m, &mp, nx, ny, &nx, &ny);
2361	if (mflags & P_OUT_OF_MAP) {	2317	if (mflags & P_OUT_OF_MAP) {
2362	max = maxfree[i];	2318	max = maxfree[i];
2363	} else {	2319	} else {
2364	blocked = GET_MAP_MOVE_BLOCK(mp, nx, ny);	2320	blocked = GET_MAP_MOVE_BLOCK(mp, nx, ny);
2365		2321
2366	if ((move_type & blocked) == move_type) {	2322	if ((move_type & blocked) == move_type) {
2367	max=maxfree[i];	2323	max=maxfree[i];
2368	} else if (mflags & P_IS_ALIVE) {	2324	} else if (mflags & P_IS_ALIVE) {
2369	for (tmp=GET_MAP_OB(mp,nx,ny); tmp!= NULL; tmp=tmp->above) {	2325	for (tmp=GET_MAP_OB(mp,nx,ny); tmp!= NULL; tmp=tmp->above) {
2370	if ((QUERY_FLAG(tmp,FLAG_MONSTER) || tmp->type==PLAYER) &&	2326	if ((QUERY_FLAG(tmp,FLAG_MONSTER) || tmp->type==PLAYER) &&
2371	(tmp != exclude ||(tmp->head && tmp->head != exclude))) {	2327	(tmp != exclude ||(tmp->head && tmp->head != exclude))) {
2372	break;	2328	break;
2373	}	2329	}
2374	}	2330	}
2375	if(tmp) {	2331	if(tmp) {
2376	return freedir[i];	2332	return freedir[i];
2377	}	2333	}
2378	}	2334	}
2379	}	2335	}
2380	}	2336	}
2381	return 0;	2337	return 0;
2382	}	2338	}
2383		2339
2384	/*	2340	/*
…		…
2548	if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW)) return 0;	2504	if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW)) return 0;
2549		2505
2550	/* yes, can see. */	2506	/* yes, can see. */
2551	if(dir < 9) return 1;	2507	if(dir < 9) return 1;
2552	return can_see_monsterP(m, x, y, reduction_dir[dir][0]) |	2508	return can_see_monsterP(m, x, y, reduction_dir[dir][0]) |
2553	can_see_monsterP(m,x,y, reduction_dir[dir][1]) |	2509	can_see_monsterP(m,x,y, reduction_dir[dir][1]) |
2554	can_see_monsterP(m,x,y, reduction_dir[dir][2]);	2510	can_see_monsterP(m,x,y, reduction_dir[dir][2]);
2555	}	2511	}
2556		2512
2557		2513
2558		2514
2559	/*	2515	/*
2560	* can_pick(picker, item): finds out if an object is possible to be	2516	* can_pick(picker, item): finds out if an object is possible to be
2561	* picked up by the picker. Returnes 1 if it can be	2517	* picked up by the picker. Returnes 1 if it can be
2562	* picked up, otherwise 0.	2518	* picked up, otherwise 0.
2563	*	2519	*
…		…
2568	*/	2524	*/
2569		2525
2570	int can_pick(const object *who, const object *item) {	2526	int can_pick(const object *who, const object *item) {
2571	return /*QUERY_FLAG(who,FLAG_WIZ)||*/	2527	return /*QUERY_FLAG(who,FLAG_WIZ)||*/
2572	(item->weight>0&&!QUERY_FLAG(item,FLAG_NO_PICK)&&	2528	(item->weight>0&&!QUERY_FLAG(item,FLAG_NO_PICK)&&
2573	!QUERY_FLAG(item,FLAG_ALIVE)&&!item->invisible &&	2529	!QUERY_FLAG(item,FLAG_ALIVE)&&!item->invisible &&
2574	(who->type==PLAYER||item->weight<who->weight/3));	2530	(who->type==PLAYER||item->weight<who->weight/3));
2575	}	2531	}
2576		2532
2577		2533
2578	/*	2534	/*
…		…
2603	prev->more = tmp;	2559	prev->more = tmp;
2604	prev = tmp;	2560	prev = tmp;
2605	}	2561	}
2606	/*** copy inventory ***/	2562	/*** copy inventory ***/
2607	for(item = src->inv; item; item = item->below) {	2563	for(item = src->inv; item; item = item->below) {
2608	(void) insert_ob_in_ob(object_create_clone(item),dst);	2564	(void) insert_ob_in_ob(object_create_clone(item),dst);
2609	}	2565	}
2610		2566
2611	return dst;	2567	return dst;
2612	}	2568	}
2613		2569
…		…
2627	/* Also remember that multiparts objects are not supported for now. */	2583	/* Also remember that multiparts objects are not supported for now. */
2628		2584
2629	object* load_object_str(const char *obstr)	2585	object* load_object_str(const char *obstr)
2630	{	2586	{
2631	object *op;	2587	object *op;
2632	FILE *tempfile;
2633	char filename[MAX_BUF];	2588	char filename[MAX_BUF];
2634	sprintf(filename,"%s/cfloadobstr2044",settings.tmpdir);	2589	sprintf(filename,"%s/cfloadobstr2044",settings.tmpdir);
		2590
2635	tempfile=fopen(filename,"w");	2591	FILE *tempfile=fopen(filename,"w");
2636	if (tempfile == NULL)	2592	if (tempfile == NULL)
2637	{	2593	{
2638	LOG(llevError,"Error - Unable to access load object temp file\n");	2594	LOG(llevError,"Error - Unable to access load object temp file\n");
2639	return NULL;	2595	return NULL;
2640	};	2596	};
2641	fprintf(tempfile,obstr);	2597	fprintf(tempfile,obstr);
2642	fclose(tempfile);	2598	fclose(tempfile);
2643		2599
2644	op=get_object();	2600	op=get_object();
2645		2601
2646	tempfile=fopen(filename,"r");	2602	object_thawer thawer (filename);
2647	if (tempfile == NULL)	2603	if (thawer)
2648	{
2649	LOG(llevError,"Error - Unable to read object temp file\n");
2650	return NULL;
2651	};
2652	load_object(tempfile,op,LO_NEWFILE,0);	2604	load_object(thawer,op,LO_NEWFILE,0);
2653	LOG(llevDebug," load str completed, object=%s\n",op->name);	2605	LOG(llevDebug," load str completed, object=%s\n",op->name);
2654	CLEAR_FLAG(op,FLAG_REMOVED);	2606	CLEAR_FLAG(op,FLAG_REMOVED);
2655	fclose(tempfile);	2607
2656	return op;	2608	return op;
2657	}	2609	}
2658		2610
2659	/* This returns the first object in who's inventory that	2611	/* This returns the first object in who's inventory that
2660	* has the same type and subtype match.	2612	* has the same type and subtype match.
…		…
2663	object *find_obj_by_type_subtype(const object *who, int type, int subtype)	2615	object *find_obj_by_type_subtype(const object *who, int type, int subtype)
2664	{	2616	{
2665	object *tmp;	2617	object *tmp;
2666		2618
2667	for (tmp=who->inv; tmp; tmp=tmp->below)	2619	for (tmp=who->inv; tmp; tmp=tmp->below)
2668	if (tmp->type == type && tmp->subtype == subtype) return tmp;	2620	if (tmp->type == type && tmp->subtype == subtype) return tmp;
2669		2621
2670	return NULL;	2622	return NULL;
2671	}	2623	}
2672		2624
2673	/* If ob has a field named key, return the link from the list,	2625	/* If ob has a field named key, return the link from the list,
…		…
2734	*/	2686	*/
2735	int set_ob_key_value_s(object * op, const char * canonical_key, const char * value, int add_key) {	2687	int set_ob_key_value_s(object * op, const char * canonical_key, const char * value, int add_key) {
2736	key_value * field = NULL, *last=NULL;	2688	key_value * field = NULL, *last=NULL;
2737		2689
2738	for (field=op->key_values; field != NULL; field=field->next) {	2690	for (field=op->key_values; field != NULL; field=field->next) {
2739	if (field->key != canonical_key) {	2691	if (field->key != canonical_key) {
2740	last = field;	2692	last = field;
2741	continue;	2693	continue;
2742	}	2694	}
2743		2695
2744	if (field->value) FREE_AND_CLEAR_STR(field->value);	2696	if (field->value) FREE_AND_CLEAR_STR(field->value);
2745	if (value)	2697	if (value)
2746	field->value = add_string(value);	2698	field->value = add_string(value);
2747	else {	2699	else {
2748	/* Basically, if the archetype has this key set,	2700	/* Basically, if the archetype has this key set,
2749	* we need to store the null value so when we save	2701	* we need to store the null value so when we save
2750	* it, we save the empty value so that when we load,	2702	* it, we save the empty value so that when we load,
2751	* we get this value back again.	2703	* we get this value back again.
2752	*/	2704	*/
2753	if (get_ob_key_link(&op->arch->clone, canonical_key))	2705	if (get_ob_key_link(&op->arch->clone, canonical_key))
2754	field->value = NULL;	2706	field->value = NULL;
2755	else {	2707	else {
2756	/* Delete this link */	2708	/* Delete this link */
2757	if (field->key) FREE_AND_CLEAR_STR(field->key);	2709	if (field->key) FREE_AND_CLEAR_STR(field->key);
2758	if (field->value) FREE_AND_CLEAR_STR(field->value);	2710	if (field->value) FREE_AND_CLEAR_STR(field->value);
2759	if (last) last->next = field->next;	2711	if (last) last->next = field->next;
2760	else op->key_values = field->next;	2712	else op->key_values = field->next;
2761	free(field);	2713	free(field);
2762	}	2714	}
2763	}	2715	}
2764	return TRUE;	2716	return TRUE;
2765	}	2717	}
2766	/* IF we get here, key doesn't exist */	2718	/* IF we get here, key doesn't exist */
2767		2719
2768	/* No field, we'll have to add it. */	2720	/* No field, we'll have to add it. */

Diff Legend

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