ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.2 by root, Fri Aug 25 17:11:52 2006 UTC vs.
Revision 1.12 by elmex, Sun Sep 3 14:33:47 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.12 2006/09/03 14:33:47 elmex 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
… …
50int nrofallocobjects = STARTMAX; /* How many OBs allocated (free + used) */ 50int nrofallocobjects = STARTMAX; /* How many OBs allocated (free + used) */
51#endif 51#endif
52 52
53object *objects; /* Pointer to the list of used objects */ 53object *objects; /* Pointer to the list of used objects */
54object *free_objects; /* Pointer to the list of unused objects */ 54object *free_objects; /* Pointer to the list of unused objects */
55object *active_objects; /* List of active objects that need to be processed */ 55object *active_objects; /* List of active objects that need to be processed */
56
57void (*object_free_callback)(object *ob);
58 56
59short freearr_x[SIZEOFFREE]= 57short 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};
62short freearr_y[SIZEOFFREE]= 60short freearr_y[SIZEOFFREE]=
… …
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)) {
… …
243signed long sum_weight(object *op) { 241signed 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
274object *is_player_inv (object *op) { 272object *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
287void dump_object2(object *op) { 285void dump_object2(object *op) {
286errmsg[0] = 0;
287return;
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. */
340void 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
377void dump_all_objects(void) { 340void 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);
… …
416 * Used only by the patch command, but not all that useful. 379 * Used only by the patch command, but not all that useful.
417 * Enables features like "patch <name-of-other-player> food 999" 380 * Enables features like "patch <name-of-other-player> food 999"
418 */ 381 */
419 382
420object *find_object_name(const char *str) { 383object *find_object_name(const char *str) {
421 const char *name=add_string(str); 384 const char *name = shstr::find (str);
422 object *op; 385 object *op;
423 for(op=objects;op!=NULL;op=op->next) 386 for(op=objects;op!=NULL;op=op->next)
424 if(op->name==name) 387 if(&op->name == name)
425 break; 388 break;
426 free_string(name); 389
427 return op; 390 return op;
428} 391}
429 392
430void free_all_object_data(void) { 393void 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
457object *get_owner(object *op) { 420object *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}
… …
470void clear_owner(object *op) 433void 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 */
487void set_owner (object *op, object *owner) 450void 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 */
524void copy_owner (object *op, object *clone) 487void 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.
559 */ 521 */
560static void free_key_values(object * op) { 522static void free_key_values(object * op)
561 key_value * i; 523{
562 key_value * next = NULL; 524 for (key_value *i = op->key_values; i != 0; )
563 525 {
564 if (op->key_values == NULL) return; 526 key_value *next = i->next;
527 delete i;
528 i = next;
565 529 }
566 for (i = op->key_values; i != NULL; i = next) { 530
567 /* Store next *first*. */
568 next = i->next;
569
570 if (i->key) FREE_AND_CLEAR_STR(i->key);
571 if (i->value) FREE_AND_CLEAR_STR(i->value);
572 i->next = NULL;
573 free(i);
574 }
575
576 op->key_values = NULL; 531 op->key_values = 0;
577} 532}
578
579 533
580/* 534/*
581 * clear_object() frees everything allocated by an object, and also 535 * clear_object() frees everything allocated by an object, and also
582 * clears all variables and flags to default settings. 536 * clears all variables and flags to default settings.
583 */ 537 */
584 538
585void clear_object(object *op) { 539void clear_object(object *op)
540{
541 op->clear ();
586 542
587 if (object_free_callback)
588 object_free_callback (op);
589
590 event *evt;
591 event *evt2;
592
593 /* redo this to be simpler/more efficient. Was also seeing
594 * crashes in the old code. Move this to the top - am
595 * seeing periodic crashes in this code, and would like to have
596 * as much info available as possible (eg, object name).
597 */
598 for (evt = op->events; evt; evt=evt2) {
599 evt2 = evt->next;
600
601 if (evt->hook != NULL) FREE_AND_CLEAR_STR(evt->hook);
602 if (evt->plugin != NULL) FREE_AND_CLEAR_STR(evt->plugin);
603 if (evt->options != NULL) FREE_AND_CLEAR_STR(evt->options);
604
605 free(evt);
606 }
607 op->events = NULL;
608
609 free_key_values(op); 543 free_key_values (op);
610 544
611 /* the memset will clear all these values for us, but we need 545 /* the memset will clear all these values for us, but we need
612 * to reduce the refcount on them. 546 * to reduce the refcount on them.
613 */ 547 */
614 if (op->name!=NULL) FREE_AND_CLEAR_STR(op->name); 548 op->name = 0;
615 if (op->name_pl!=NULL) FREE_AND_CLEAR_STR(op->name_pl); 549 op->name_pl = 0;
616 if (op->title != NULL) FREE_AND_CLEAR_STR(op->title); 550 op->title = 0;
617 if (op->race!=NULL) FREE_AND_CLEAR_STR(op->race); 551 op->race = 0;
618 if (op->slaying!=NULL) FREE_AND_CLEAR_STR(op->slaying); 552 op->slaying = 0;
619 if (op->skill!=NULL) FREE_AND_CLEAR_STR(op->skill); 553 op->skill = 0;
620 if (op->msg!=NULL) FREE_AND_CLEAR_STR(op->msg); 554 op->msg = 0;
621 if (op->lore!=NULL) FREE_AND_CLEAR_STR(op->lore); 555 op->lore = 0;
622 if (op->materialname!= NULL) FREE_AND_CLEAR_STR(op->materialname); 556 op->materialname = 0;
623 557
624
625 memset((void*)op, 0, sizeof (object_special)); 558 memset((void*)op, 0, sizeof (object_special));
626 /* Below here, we clear things that are not done by the memset, 559 /* Below here, we clear things that are not done by the memset,
627 * or set default values that are not zero. 560 * or set default values that are not zero.
628 */ 561 */
629 /* This is more or less true */ 562 /* This is more or less true */
630 SET_FLAG(op, FLAG_REMOVED); 563 SET_FLAG (op, FLAG_REMOVED);
631 564
632
633 op->contr = NULL; 565 op->contr = NULL;
634 op->below=NULL; 566 op->below = NULL;
635 op->above=NULL; 567 op->above = NULL;
636 op->inv=NULL; 568 op->inv = NULL;
637 op->events=NULL;
638 op->container=NULL; 569 op->container=NULL;
639 op->env=NULL; 570 op->env=NULL;
640 op->more=NULL; 571 op->more=NULL;
641 op->head=NULL; 572 op->head=NULL;
642 op->map=NULL; 573 op->map=NULL;
643 op->refcount=0; 574 op->refcount=0;
644 op->active_next = NULL; 575 op->active_next = NULL;
645 op->active_prev = NULL; 576 op->active_prev = NULL;
646 /* What is not cleared is next, prev, and count */ 577 /* What is not cleared is next, prev, and count */
647 578
648 op->expmul=1.0; 579 op->expmul=1.0;
649 op->face = blank_face; 580 op->face = blank_face;
650 op->attacked_by_count = (tag_t) -1; 581 op->attacked_by_count = (tag_t) -1;
582
651 if (settings.casting_time) 583 if (settings.casting_time)
652 op->casting_time = -1; 584 op->casting_time = -1;
653
654} 585}
655 586
656/* 587/*
657 * copy object first frees everything allocated by the second object, 588 * copy object first frees everything allocated by the second object,
658 * and then copies the contends of the first object into the second 589 * and then copies the contends of the first object into the second
… …
660 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 591 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
661 * if the first object is freed, the pointers in the new object 592 * if the first object is freed, the pointers in the new object
662 * will point at garbage. 593 * will point at garbage.
663 */ 594 */
664 595
665void copy_object(object *op2, object *op) { 596void copy_object(object *op2, object *op)
597{
666 int is_freed=QUERY_FLAG(op,FLAG_FREED),is_removed=QUERY_FLAG(op,FLAG_REMOVED); 598 int is_freed=QUERY_FLAG(op,FLAG_FREED),is_removed=QUERY_FLAG(op,FLAG_REMOVED);
667 event *evt, *evt2, *evt_new;
668 599
669 if (object_free_callback) 600 op->clear ();
670 object_free_callback (op);
671 601
672 // callback registries and self are empty for copied objects
673 // this ought to change in the future
674
675 /* Decrement the refcounts, but don't bother zeroing the fields;
676 they'll be overwritten by memcpy. */
677 if(op->name!=NULL) free_string(op->name);
678 if(op->name_pl!=NULL) free_string(op->name_pl);
679 if(op->title!=NULL) free_string(op->title);
680 if(op->race!=NULL) free_string(op->race);
681 if(op->slaying!=NULL) free_string(op->slaying);
682 if(op->skill!=NULL) free_string(op->skill);
683 if(op->msg!=NULL) free_string(op->msg);
684 if(op->lore!=NULL) free_string(op->lore);
685 if(op->materialname != NULL) free_string(op->materialname);
686 if(op->custom_name != NULL) free_string(op->custom_name);
687
688 /* Basically, same code as from clear_object() */
689 for (evt = op->events; evt; evt=evt2) {
690 evt2 = evt->next;
691
692 if (evt->hook != NULL) FREE_AND_CLEAR_STR(evt->hook);
693 if (evt->plugin != NULL) FREE_AND_CLEAR_STR(evt->plugin);
694 if (evt->options != NULL) FREE_AND_CLEAR_STR(evt->options);
695
696 free(evt);
697 }
698 op->events = NULL;
699
700 free_key_values(op); 602 free_key_values (op);
701 603
702 *(object_special *)op = *(object_special *)op2; 604 *(object_special *)op = *(object_special *)op2;
605 op2->clone (op);
703 606
704 if(is_freed) SET_FLAG(op,FLAG_FREED); 607 if (is_freed) SET_FLAG(op,FLAG_FREED);
705 if(is_removed) SET_FLAG(op,FLAG_REMOVED); 608 if (is_removed) SET_FLAG(op,FLAG_REMOVED);
706 if(op->name!=NULL) add_refcount(op->name);
707 if(op->name_pl!=NULL) add_refcount(op->name_pl);
708 if(op->title!=NULL) add_refcount(op->title);
709 if(op->race!=NULL) add_refcount(op->race);
710 if(op->slaying!=NULL) add_refcount(op->slaying);
711 if(op->skill!=NULL) add_refcount(op->skill);
712 if(op->lore!=NULL) add_refcount(op->lore);
713 if(op->msg!=NULL) add_refcount(op->msg);
714 if(op->custom_name!=NULL) add_refcount(op->custom_name);
715 if (op->materialname != NULL) add_refcount(op->materialname);
716 609
717 if((op2->speed<0) && !editor) 610 if (op2->speed < 0)
718 op->speed_left=op2->speed_left-RANDOM()%200/100.0; 611 op->speed_left = op2->speed_left - RANDOM() % 200 / 100.0;
719 612
720 /* Copy over event information */
721 evt2 = NULL;
722 for (evt = op2->events; evt; evt=evt->next) {
723 evt_new = (event *) malloc(sizeof(event));
724 memcpy(evt_new, evt, sizeof(event));
725 if (evt_new->hook) add_refcount(evt_new->hook);
726 if (evt_new->plugin) add_refcount(evt_new->plugin);
727 if (evt_new->options) add_refcount(evt_new->options);
728 evt_new->next = NULL;
729
730 /* Try to be a little clever here, and store away the
731 * last event we copied, so that its simpler to update the
732 * pointer.
733 */
734 if (evt2)
735 evt2->next = evt_new;
736 else
737 op->events = evt_new;
738
739 evt2 = evt_new;
740 }
741 /* Copy over key_values, if any. */ 613 /* Copy over key_values, if any. */
742 if (op2->key_values != NULL) { 614 if (op2->key_values != NULL) {
743 key_value * tail = NULL; 615 key_value *tail = NULL;
744 key_value * i; 616 key_value *i;
745 617
746 op->key_values = NULL; 618 op->key_values = NULL;
747 619
748 for (i = op2->key_values; i != NULL; i = i->next) { 620 for (i = op2->key_values; i != NULL; i = i->next)
749 key_value * new_link = (key_value *) malloc(sizeof(key_value)); 621 {
622 key_value *new_link = new key_value;
750 623
751 new_link->next = NULL; 624 new_link->next = NULL;
752 new_link->key = add_refcount(i->key); 625 new_link->key = i->key;
753 if (i->value) 626 new_link->value = i->value;
754 new_link->value = add_refcount(i->value);
755 else
756 new_link->value = NULL;
757 627
758 /* Try and be clever here, too. */ 628 /* Try and be clever here, too. */
759 if (op->key_values == NULL) { 629 if (op->key_values == NULL)
630 {
760 op->key_values = new_link; 631 op->key_values = new_link;
761 tail = new_link; 632 tail = new_link;
762 } else { 633 }
763 tail->next = new_link; 634 else
764 tail = new_link; 635 {
765 } 636 tail->next = new_link;
766 } 637 tail = new_link;
638 }
767 } 639 }
640 }
768 641
769 update_ob_speed(op); 642 update_ob_speed (op);
770} 643}
771 644
772/* 645/*
773 * expand_objects() allocates more objects for the list of unused objects. 646 * expand_objects() allocates more objects for the list of unused objects.
774 * It is called from get_object() if the unused list is empty. 647 * It is called from get_object() if the unused list is empty.
775 */ 648 */
776 649
777void expand_objects(void) { 650void expand_objects(void) {
778 int i; 651 int i;
779 object *obj; 652 object *obj;
780 obj = (object *) CALLOC(OBJ_EXPAND,sizeof(object)); 653 obj = new object [OBJ_EXPAND];
781 654
782 if(obj==NULL)
783 fatal(OUT_OF_MEMORY);
784 free_objects=obj; 655 free_objects=obj;
785 obj[0].prev=NULL; 656 obj[0].prev=NULL;
786 obj[0].next= &obj[1], 657 obj[0].next= &obj[1],
787 SET_FLAG(&(obj[0]), FLAG_REMOVED); 658 SET_FLAG(&(obj[0]), FLAG_REMOVED);
788 SET_FLAG(&(obj[0]), FLAG_FREED); 659 SET_FLAG(&(obj[0]), FLAG_FREED);
… …
806 * get_object() grabs an object from the list of unused objects, makes 677 * get_object() grabs an object from the list of unused objects, makes
807 * sure it is initialised, and returns it. 678 * sure it is initialised, and returns it.
808 * If there are no free objects, expand_objects() is called to get more. 679 * If there are no free objects, expand_objects() is called to get more.
809 */ 680 */
810 681
811object *get_object(void) { 682object *get_object(void)
683{
812 object *op; 684 object *op;
813 685
814 if(free_objects==NULL) { 686 if(free_objects==NULL)
815 expand_objects(); 687 expand_objects();
816 } 688
817 op=free_objects; 689 op = free_objects;
818#ifdef MEMORY_DEBUG
819 /* The idea is hopefully by doing a realloc, the memory
820 * debugging program will now use the current stack trace to
821 * report leaks.
822 */
823 op = realloc(op, sizeof(object));
824 SET_FLAG(op, FLAG_REMOVED);
825 SET_FLAG(op, FLAG_FREED);
826#endif
827 690
828 if(!QUERY_FLAG(op,FLAG_FREED)) { 691 if (!QUERY_FLAG (op, FLAG_FREED))
829 LOG(llevError,"Fatal: Getting busy object.\n"); 692 LOG(llevError,"Fatal: Getting busy object.\n");
830 } 693
831 free_objects=op->next; 694 free_objects = op->next;
695
832 if(free_objects!=NULL) 696 if (free_objects != NULL)
833 free_objects->prev=NULL; 697 free_objects->prev = NULL;
698
834 op->count= ++ob_count; 699 op->count= ++ob_count;
835 op->name=NULL; 700 op->name=NULL;
836 op->name_pl=NULL; 701 op->name_pl=NULL;
837 op->title=NULL; 702 op->title=NULL;
838 op->race=NULL; 703 op->race=NULL;
… …
860 * be called to update the face variable, _and_ how it looks on the map. 725 * be called to update the face variable, _and_ how it looks on the map.
861 */ 726 */
862 727
863void update_turn_face(object *op) { 728void update_turn_face(object *op) {
864 if(!QUERY_FLAG(op,FLAG_IS_TURNABLE)||op->arch==NULL) 729 if(!QUERY_FLAG(op,FLAG_IS_TURNABLE)||op->arch==NULL)
865 return; 730 return;
866 SET_ANIMATION(op, op->direction); 731 SET_ANIMATION(op, op->direction);
867 update_object(op,UP_OBJ_FACE); 732 update_object(op,UP_OBJ_FACE);
868} 733}
869 734
870/* 735/*
… …
879 /* No reason putting the archetypes objects on the speed list, 744 /* No reason putting the archetypes objects on the speed list,
880 * since they never really need to be updated. 745 * since they never really need to be updated.
881 */ 746 */
882 747
883 if (QUERY_FLAG(op, FLAG_FREED) && op->speed) { 748 if (QUERY_FLAG(op, FLAG_FREED) && op->speed) {
884 LOG(llevError,"Object %s is freed but has speed.\n", op->name); 749 LOG(llevError,"Object %s is freed but has speed.\n", &op->name);
885#ifdef MANY_CORES 750#ifdef MANY_CORES
886 abort(); 751 abort();
887#else 752#else
888 op->speed = 0; 753 op->speed = 0;
889#endif 754#endif
890 } 755 }
891 if (arch_init) { 756 if (arch_init) {
892 return; 757 return;
893 } 758 }
894 if (FABS(op->speed)>MIN_ACTIVE_SPEED) { 759 if (FABS(op->speed)>MIN_ACTIVE_SPEED) {
895 /* If already on active list, don't do anything */ 760 /* If already on active list, don't do anything */
896 if (op->active_next || op->active_prev || op==active_objects) 761 if (op->active_next || op->active_prev || op==active_objects)
897 return; 762 return;
898 763
899 /* process_events() expects us to insert the object at the beginning 764 /* process_events() expects us to insert the object at the beginning
900 * of the list. */ 765 * of the list. */
901 op->active_next = active_objects; 766 op->active_next = active_objects;
902 if (op->active_next!=NULL) 767 if (op->active_next!=NULL)
903 op->active_next->active_prev = op; 768 op->active_next->active_prev = op;
904 active_objects = op; 769 active_objects = op;
905 } 770 }
906 else { 771 else {
907 /* If not on the active list, nothing needs to be done */ 772 /* If not on the active list, nothing needs to be done */
908 if (!op->active_next && !op->active_prev && op!=active_objects) 773 if (!op->active_next && !op->active_prev && op!=active_objects)
909 return; 774 return;
910 775
911 if (op->active_prev==NULL) { 776 if (op->active_prev==NULL) {
912 active_objects = op->active_next; 777 active_objects = op->active_next;
913 if (op->active_next!=NULL) 778 if (op->active_next!=NULL)
914 op->active_next->active_prev = NULL; 779 op->active_next->active_prev = NULL;
915 } 780 }
916 else { 781 else {
917 op->active_prev->active_next = op->active_next; 782 op->active_prev->active_next = op->active_next;
918 if (op->active_next) 783 if (op->active_next)
919 op->active_next->active_prev = op->active_prev; 784 op->active_next->active_prev = op->active_prev;
920 } 785 }
921 op->active_next = NULL; 786 op->active_next = NULL;
922 op->active_prev = NULL; 787 op->active_prev = NULL;
923 } 788 }
924} 789}
925 790
926/* This function removes object 'op' from the list of active 791/* This function removes object 'op' from the list of active
927 * objects. 792 * objects.
… …
933 */ 798 */
934void remove_from_active_list(object *op) 799void remove_from_active_list(object *op)
935{ 800{
936 /* If not on the active list, nothing needs to be done */ 801 /* If not on the active list, nothing needs to be done */
937 if (!op->active_next && !op->active_prev && op!=active_objects) 802 if (!op->active_next && !op->active_prev && op!=active_objects)
938 return; 803 return;
939 804
940 if (op->active_prev==NULL) { 805 if (op->active_prev==NULL) {
941 active_objects = op->active_next; 806 active_objects = op->active_next;
942 if (op->active_next!=NULL) 807 if (op->active_next!=NULL)
943 op->active_next->active_prev = NULL; 808 op->active_next->active_prev = NULL;
944 } 809 }
945 else { 810 else {
946 op->active_prev->active_next = op->active_next; 811 op->active_prev->active_next = op->active_next;
947 if (op->active_next) 812 if (op->active_next)
948 op->active_next->active_prev = op->active_prev; 813 op->active_next->active_prev = op->active_prev;
949 } 814 }
950 op->active_next = NULL; 815 op->active_next = NULL;
951 op->active_prev = NULL; 816 op->active_prev = NULL;
952} 817}
953 818
… …
973 * UP_OBJ_FACE: only the objects face has changed. 838 * UP_OBJ_FACE: only the objects face has changed.
974 */ 839 */
975 840
976void update_object(object *op, int action) { 841void update_object(object *op, int action) {
977 int update_now=0, flags; 842 int update_now=0, flags;
978 MoveType move_on, move_off, move_block, move_slow; 843 MoveType move_on, move_off, move_block, move_slow;
979 844
980 if (op == NULL) { 845 if (op == NULL) {
981 /* this should never happen */ 846 /* this should never happen */
982 LOG(llevDebug,"update_object() called for NULL object.\n"); 847 LOG(llevDebug,"update_object() called for NULL object.\n");
983 return; 848 return;
984 } 849 }
985 850
986 if(op->env!=NULL) { 851 if(op->env!=NULL) {
987 /* Animation is currently handled by client, so nothing 852 /* Animation is currently handled by client, so nothing
988 * to do in this case. 853 * to do in this case.
989 */ 854 */
990 return; 855 return;
991 } 856 }
992 857
993 /* If the map is saving, don't do anything as everything is 858 /* If the map is saving, don't do anything as everything is
994 * going to get freed anyways. 859 * going to get freed anyways.
995 */ 860 */
996 if (!op->map || op->map->in_memory == MAP_SAVING) return; 861 if (!op->map || op->map->in_memory == MAP_SAVING) return;
997 862
998 /* make sure the object is within map boundaries */ 863 /* make sure the object is within map boundaries */
999 if (op->x < 0 || op->x >= MAP_WIDTH(op->map) || 864 if (op->x < 0 || op->x >= MAP_WIDTH(op->map) ||
1000 op->y < 0 || op->y >= MAP_HEIGHT(op->map)) { 865 op->y < 0 || op->y >= MAP_HEIGHT(op->map)) {
1001 LOG(llevError,"update_object() called for object out of map!\n"); 866 LOG(llevError,"update_object() called for object out of map!\n");
1002#ifdef MANY_CORES 867#ifdef MANY_CORES
1003 abort(); 868 abort();
1004#endif 869#endif
1005 return; 870 return;
1006 } 871 }
1007 872
1008 flags = GET_MAP_FLAGS(op->map, op->x, op->y); 873 flags = GET_MAP_FLAGS(op->map, op->x, op->y);
1009 SET_MAP_FLAGS(op->map, op->x, op->y, flags | P_NEED_UPDATE); 874 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); 875 move_slow = GET_MAP_MOVE_SLOW(op->map, op->x, op->y);
… …
1023 update_now=1; 888 update_now=1;
1024 889
1025 if (QUERY_FLAG(op, FLAG_ALIVE) && !(flags & P_IS_ALIVE)) 890 if (QUERY_FLAG(op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
1026 update_now=1; 891 update_now=1;
1027 892
1028 if ((move_on | op->move_on) != move_on) update_now=1; 893 if ((move_on | op->move_on) != move_on) update_now=1;
1029 if ((move_off | op->move_off) != move_off) update_now=1; 894 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 895 /* This isn't perfect, but I don't expect a lot of objects to
1031 * to have move_allow right now. 896 * to have move_allow right now.
1032 */ 897 */
1033 if (((move_block | op->move_block) & ~op->move_allow) != move_block) 898 if (((move_block | op->move_block) & ~op->move_allow) != move_block)
1034 update_now=1; 899 update_now=1;
1035 if ((move_slow | op->move_slow) != move_slow) update_now=1; 900 if ((move_slow | op->move_slow) != move_slow) update_now=1;
1036 } 901 }
1037 /* if the object is being removed, we can't make intelligent 902 /* if the object is being removed, we can't make intelligent
1038 * decisions, because remove_ob can't really pass the object 903 * decisions, because remove_ob can't really pass the object
1039 * that is being removed. 904 * that is being removed.
1040 */ 905 */
1041 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) { 906 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) {
1042 update_now=1; 907 update_now=1;
1043 } else if (action == UP_OBJ_FACE) { 908 } else if (action == UP_OBJ_FACE) {
1044 /* Nothing to do for that case */ 909 /* Nothing to do for that case */
1045 } 910 }
1046 else { 911 else {
1047 LOG(llevError,"update_object called with invalid action: %d\n", action); 912 LOG(llevError,"update_object called with invalid action: %d\n", action);
1048 } 913 }
1049 914
1050 if (update_now) { 915 if (update_now) {
1051 SET_MAP_FLAGS(op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE); 916 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); 917 update_position(op->map, op->x, op->y);
1053 } 918 }
1054 919
1055 if(op->more!=NULL) 920 if(op->more!=NULL)
1056 update_object(op->more, action); 921 update_object(op->more, action);
1057} 922}
1058 923
1059 924
1060/* 925/*
1061 * free_object() frees everything allocated by an object, removes 926 * free_object() frees everything allocated by an object, removes
… …
1072 free_object2(ob, 0); 937 free_object2(ob, 0);
1073} 938}
1074void free_object2(object *ob, int free_inventory) { 939void free_object2(object *ob, int free_inventory) {
1075 object *tmp,*op; 940 object *tmp,*op;
1076 941
1077 if (object_free_callback) 942 ob->clear ();
1078 object_free_callback (ob);
1079 943
1080 if (!QUERY_FLAG(ob,FLAG_REMOVED)) { 944 if (!QUERY_FLAG(ob,FLAG_REMOVED)) {
1081 LOG(llevDebug,"Free object called with non removed object\n"); 945 LOG(llevDebug,"Free object called with non removed object\n");
1082 dump_object(ob); 946 dump_object(ob);
1083#ifdef MANY_CORES 947#ifdef MANY_CORES
1084 abort(); 948 abort();
1085#endif 949#endif
1086 } 950 }
1087 if(QUERY_FLAG(ob,FLAG_FRIENDLY)) { 951 if(QUERY_FLAG(ob,FLAG_FRIENDLY)) {
1088 LOG(llevMonster,"Warning: tried to free friendly object.\n"); 952 LOG(llevMonster,"Warning: tried to free friendly object.\n");
1089 remove_friendly_object(ob); 953 remove_friendly_object(ob);
1090 } 954 }
1091 if(QUERY_FLAG(ob,FLAG_FREED)) { 955 if(QUERY_FLAG(ob,FLAG_FREED)) {
1092 dump_object(ob); 956 dump_object(ob);
1093 LOG(llevError,"Trying to free freed object.\n%s\n",errmsg); 957 LOG(llevError,"Trying to free freed object.\n%s\n",errmsg);
1094 return; 958 return;
1095 } 959 }
1096 if(ob->more!=NULL) { 960 if(ob->more!=NULL) {
1097 free_object2(ob->more, free_inventory); 961 free_object2(ob->more, free_inventory);
1098 ob->more=NULL; 962 ob->more=NULL;
1099 } 963 }
1100 if (ob->inv) { 964 if (ob->inv) {
1101 /* Only if the space blocks everything do we not process - 965 /* Only if the space blocks everything do we not process -
1102 * if some form of movemnt is allowed, let objects 966 * if some form of movemnt is allowed, let objects
1103 * drop on that space. 967 * drop on that space.
1104 */ 968 */
1105 if (free_inventory || ob->map==NULL || ob->map->in_memory!=MAP_IN_MEMORY || 969 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)) 970 (GET_MAP_MOVE_BLOCK(ob->map, ob->x, ob->y) == MOVE_ALL))
1107 { 971 {
1108 op=ob->inv; 972 op=ob->inv;
1109 while(op!=NULL) { 973 while(op!=NULL) {
1110 tmp=op->below; 974 tmp=op->below;
1111 remove_ob(op); 975 remove_ob(op);
1112 free_object2(op, free_inventory); 976 free_object2(op, free_inventory);
1113 op=tmp; 977 op=tmp;
1114 } 978 }
1115 } 979 }
1116 else { /* Put objects in inventory onto this space */ 980 else { /* Put objects in inventory onto this space */
1117 op=ob->inv; 981 op=ob->inv;
1118 while(op!=NULL) { 982 while(op!=NULL) {
1119 tmp=op->below; 983 tmp=op->below;
1120 remove_ob(op); 984 remove_ob(op);
1121 if(QUERY_FLAG(op,FLAG_STARTEQUIP)||QUERY_FLAG(op,FLAG_NO_DROP) || 985 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)) 986 op->type==RUNE || op->type==TRAP || QUERY_FLAG(op,FLAG_IS_A_TEMPLATE))
1123 free_object(op); 987 free_object(op);
1124 else { 988 else {
1125 op->x=ob->x; 989 op->x=ob->x;
1126 op->y=ob->y; 990 op->y=ob->y;
1127 insert_ob_in_map(op,ob->map,NULL,0); /* Insert in same map as the envir */ 991 insert_ob_in_map(op,ob->map,NULL,0); /* Insert in same map as the envir */
1128 } 992 }
1129 op=tmp; 993 op=tmp;
1130 } 994 }
1131 } 995 }
1132 } 996 }
1133 /* Remove object from the active list */ 997 /* Remove object from the active list */
1134 ob->speed = 0; 998 ob->speed = 0;
1135 update_ob_speed(ob); 999 update_ob_speed(ob);
1136 1000
1137 SET_FLAG(ob, FLAG_FREED); 1001 SET_FLAG(ob, FLAG_FREED);
1138 ob->count = 0; 1002 ob->count = 0;
1139 1003
1140 /* Remove this object from the list of used objects */ 1004 /* Remove this object from the list of used objects */
1141 if(ob->prev==NULL) { 1005 if(ob->prev==NULL) {
1142 objects=ob->next; 1006 objects=ob->next;
1143 if(objects!=NULL) 1007 if(objects!=NULL)
1144 objects->prev=NULL; 1008 objects->prev=NULL;
1145 } 1009 }
1146 else { 1010 else {
1147 ob->prev->next=ob->next; 1011 ob->prev->next=ob->next;
1148 if(ob->next!=NULL) 1012 if(ob->next!=NULL)
1149 ob->next->prev=ob->prev; 1013 ob->next->prev=ob->prev;
1150 } 1014 }
1151 1015
1152 if(ob->name!=NULL) FREE_AND_CLEAR_STR(ob->name); 1016 ob->name = 0;
1153 if(ob->name_pl!=NULL) FREE_AND_CLEAR_STR(ob->name_pl); 1017 ob->name_pl = 0;
1154 if(ob->title!=NULL) FREE_AND_CLEAR_STR(ob->title); 1018 ob->title = 0;
1155 if(ob->race!=NULL) FREE_AND_CLEAR_STR(ob->race); 1019 ob->race = 0;
1156 if(ob->slaying!=NULL) FREE_AND_CLEAR_STR(ob->slaying); 1020 ob->slaying = 0;
1157 if(ob->skill!=NULL) FREE_AND_CLEAR_STR(ob->skill); 1021 ob->skill = 0;
1158 if(ob->lore!=NULL) FREE_AND_CLEAR_STR(ob->lore); 1022 ob->lore = 0;
1159 if(ob->msg!=NULL) FREE_AND_CLEAR_STR(ob->msg); 1023 ob->msg = 0;
1160 if(ob->materialname!=NULL) FREE_AND_CLEAR_STR(ob->materialname); 1024 ob->materialname = 0;
1161 1025
1162
1163 /* Why aren't events freed? */
1164 free_key_values(ob); 1026 free_key_values (ob);
1165
1166#if 0 /* MEMORY_DEBUG*/
1167 /* This is a nice idea. Unfortunately, a lot of the code in crossfire
1168 * presumes the freed_object will stick around for at least a little
1169 * bit
1170 */
1171 /* this is necessary so that memory debugging programs will
1172 * be able to accurately report source of malloc. If we recycle
1173 * objects, then some other area may be doing the get_object
1174 * and not freeing it, but the original one that malloc'd the
1175 * object will get the blame.
1176 */
1177 free(ob);
1178#else
1179 1027
1180 /* Now link it with the free_objects list: */ 1028 /* Now link it with the free_objects list: */
1181 ob->prev=NULL; 1029 ob->prev=NULL;
1182 ob->next=free_objects; 1030 ob->next=free_objects;
1031
1183 if(free_objects!=NULL) 1032 if(free_objects!=NULL)
1184 free_objects->prev=ob; 1033 free_objects->prev=ob;
1034
1185 free_objects=ob; 1035 free_objects=ob;
1186 nroffreeobjects++; 1036 nroffreeobjects++;
1187#endif
1188} 1037}
1189 1038
1190/* 1039/*
1191 * count_free() returns the number of objects on the list of free objects. 1040 * count_free() returns the number of objects on the list of free objects.
1192 */ 1041 */
1193 1042
1194int count_free(void) { 1043int count_free ()
1044{
1195 int i=0; 1045 int i=0;
1196 object *tmp=free_objects; 1046 object *tmp=free_objects;
1197 while(tmp!=NULL) 1047 while(tmp!=NULL)
1198 tmp=tmp->next, i++; 1048 tmp=tmp->next, i++;
1199 return i; 1049 return i;
… …
1201 1051
1202/* 1052/*
1203 * count_used() returns the number of objects on the list of used objects. 1053 * count_used() returns the number of objects on the list of used objects.
1204 */ 1054 */
1205 1055
1206int count_used(void) { 1056int count_used()
1057{
1207 int i=0; 1058 int i=0;
1208 object *tmp=objects; 1059 object *tmp=objects;
1209 while(tmp!=NULL) 1060 while(tmp!=NULL)
1210 tmp=tmp->next, i++; 1061 tmp=tmp->next, i++;
1211 return i; 1062 return i;
… …
1213 1064
1214/* 1065/*
1215 * count_active() returns the number of objects on the list of active objects. 1066 * count_active() returns the number of objects on the list of active objects.
1216 */ 1067 */
1217 1068
1218int count_active(void) { 1069int count_active()
1070{
1219 int i=0; 1071 int i=0;
1220 object *tmp=active_objects; 1072 object *tmp=active_objects;
1221 while(tmp!=NULL) 1073 while(tmp!=NULL)
1222 tmp=tmp->active_next, i++; 1074 tmp=tmp->active_next, i++;
1223 return i; 1075 return i;
… …
1255 mapstruct *m; 1107 mapstruct *m;
1256 sint16 x,y; 1108 sint16 x,y;
1257 1109
1258 1110
1259 if(QUERY_FLAG(op,FLAG_REMOVED)) { 1111 if(QUERY_FLAG(op,FLAG_REMOVED)) {
1260 dump_object(op); 1112 dump_object(op);
1261 LOG(llevError,"Trying to remove removed object.\n%s\n",errmsg); 1113 LOG(llevError,"Trying to remove removed object.\n%s\n",errmsg);
1262 1114
1263 /* Changed it to always dump core in this case. As has been learned 1115 /* Changed it to always dump core in this case. As has been learned
1264 * in the past, trying to recover from errors almost always 1116 * in the past, trying to recover from errors almost always
1265 * make things worse, and this is a real error here - something 1117 * make things worse, and this is a real error here - something
1266 * that should not happen. 1118 * that should not happen.
1267 * Yes, if this was a mission critical app, trying to do something 1119 * 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 1120 * 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 1121 * may have other disastrous problems. Cf runs out of a script
1270 * so is easily enough restarted without any real problems. 1122 * so is easily enough restarted without any real problems.
1271 * MSW 2001-07-01 1123 * MSW 2001-07-01
1272 */ 1124 */
1273 abort(); 1125 abort();
1274 } 1126 }
1275 if(op->more!=NULL) 1127 if(op->more!=NULL)
1276 remove_ob(op->more); 1128 remove_ob(op->more);
1277 1129
1278 SET_FLAG(op, FLAG_REMOVED); 1130 SET_FLAG(op, FLAG_REMOVED);
1279 1131
1280 /* 1132 /*
1281 * In this case, the object to be removed is in someones 1133 * In this case, the object to be removed is in someones
1282 * inventory. 1134 * inventory.
1283 */ 1135 */
1284 if(op->env!=NULL) { 1136 if(op->env!=NULL) {
1285 if(op->nrof) 1137 if(op->nrof)
1286 sub_weight(op->env, op->weight*op->nrof); 1138 sub_weight(op->env, op->weight*op->nrof);
1287 else 1139 else
1288 sub_weight(op->env, op->weight+op->carrying); 1140 sub_weight(op->env, op->weight+op->carrying);
1289 1141
1290 /* NO_FIX_PLAYER is set when a great many changes are being 1142 /* NO_FIX_PLAYER is set when a great many changes are being
1291 * made to players inventory. If set, avoiding the call 1143 * made to players inventory. If set, avoiding the call
1292 * to save cpu time. 1144 * to save cpu time.
1293 */ 1145 */
1294 if ((otmp=is_player_inv(op->env))!=NULL && otmp->contr && 1146 if ((otmp=is_player_inv(op->env))!=NULL && otmp->contr &&
1295 !QUERY_FLAG(otmp,FLAG_NO_FIX_PLAYER)) 1147 !QUERY_FLAG(otmp,FLAG_NO_FIX_PLAYER))
1296 fix_player(otmp); 1148 fix_player(otmp);
1297 1149
1298 if(op->above!=NULL) 1150 if(op->above!=NULL)
1299 op->above->below=op->below; 1151 op->above->below=op->below;
1300 else 1152 else
1301 op->env->inv=op->below; 1153 op->env->inv=op->below;
1302 1154
1303 if(op->below!=NULL) 1155 if(op->below!=NULL)
1304 op->below->above=op->above; 1156 op->below->above=op->above;
1305 1157
1306 /* we set up values so that it could be inserted into 1158 /* we set up values so that it could be inserted into
1307 * the map, but we don't actually do that - it is up 1159 * the map, but we don't actually do that - it is up
1308 * to the caller to decide what we want to do. 1160 * to the caller to decide what we want to do.
1309 */ 1161 */
1310 op->x=op->env->x,op->y=op->env->y; 1162 op->x=op->env->x,op->y=op->env->y;
1311 op->ox=op->x,op->oy=op->y;
1312 op->map=op->env->map; 1163 op->map=op->env->map;
1313 op->above=NULL,op->below=NULL; 1164 op->above=NULL,op->below=NULL;
1314 op->env=NULL; 1165 op->env=NULL;
1315 return; 1166 return;
1316 } 1167 }
1317 1168
1318 /* If we get here, we are removing it from a map */ 1169 /* If we get here, we are removing it from a map */
1319 if (op->map == NULL) return; 1170 if (op->map == NULL) return;
1320 1171
1321 x = op->x; 1172 x = op->x;
1322 y = op->y; 1173 y = op->y;
1323 m = get_map_from_coord(op->map, &x, &y); 1174 m = get_map_from_coord(op->map, &x, &y);
1324 1175
1325 if (!m) { 1176 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", 1177 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); 1178 op->map->path, op->x, op->y);
1328 /* in old days, we used to set x and y to 0 and continue. 1179 /* 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 1180 * it seems if we get into this case, something is probablye
1330 * screwed up and should be fixed. 1181 * screwed up and should be fixed.
1331 */ 1182 */
1332 abort(); 1183 abort();
1333 } 1184 }
1334 if (op->map != m) { 1185 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", 1186 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); 1187 op->map->path, m->path, op->x, op->y, x, y);
1337 } 1188 }
1338 1189
1339 /* Re did the following section of code - it looks like it had 1190 /* Re did the following section of code - it looks like it had
1340 * lots of logic for things we no longer care about 1191 * lots of logic for things we no longer care about
1341 */ 1192 */
1342 1193
1343 /* link the object above us */ 1194 /* link the object above us */
1344 if (op->above) 1195 if (op->above)
1345 op->above->below=op->below; 1196 op->above->below=op->below;
1346 else 1197 else
1347 SET_MAP_TOP(m,x,y,op->below); /* we were top, set new top */ 1198 SET_MAP_TOP(m,x,y,op->below); /* we were top, set new top */
1348 1199
1349 /* Relink the object below us, if there is one */ 1200 /* Relink the object below us, if there is one */
1350 if(op->below) { 1201 if(op->below) {
1351 op->below->above=op->above; 1202 op->below->above=op->above;
1352 } else { 1203 } else {
1353 /* Nothing below, which means we need to relink map object for this space 1204 /* 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 1205 * use translated coordinates in case some oddness with map tiling is
1355 * evident 1206 * evident
1356 */ 1207 */
1357 if(GET_MAP_OB(m,x,y)!=op) { 1208 if(GET_MAP_OB(m,x,y)!=op) {
1358 dump_object(op); 1209 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); 1210 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)); 1211 dump_object(GET_MAP_OB(m,x,y));
1361 LOG(llevError,"%s\n",errmsg); 1212 LOG(llevError,"%s\n",errmsg);
1362 } 1213 }
1363 SET_MAP_OB(m,x,y,op->above); /* goes on above it. */ 1214 SET_MAP_OB(m,x,y,op->above); /* goes on above it. */
1364 } 1215 }
1365 op->above=NULL; 1216 op->above=NULL;
1366 op->below=NULL; 1217 op->below=NULL;
1367 1218
1368 if (op->map->in_memory == MAP_SAVING) 1219 if (op->map->in_memory == MAP_SAVING)
1369 return; 1220 return;
1370 1221
1371 tag = op->count; 1222 tag = op->count;
1372 check_walk_off = ! QUERY_FLAG (op, FLAG_NO_APPLY); 1223 check_walk_off = ! QUERY_FLAG (op, FLAG_NO_APPLY);
1373 for(tmp=GET_MAP_OB(m,x,y);tmp!=NULL;tmp=tmp->above) { 1224 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 1225 /* No point updating the players look faces if he is the object
1375 * being removed. 1226 * being removed.
1376 */ 1227 */
1377 1228
1378 if(tmp->type==PLAYER && tmp!=op) { 1229 if(tmp->type==PLAYER && tmp!=op) {
1379 /* If a container that the player is currently using somehow gets 1230 /* If a container that the player is currently using somehow gets
1380 * removed (most likely destroyed), update the player view 1231 * removed (most likely destroyed), update the player view
1381 * appropriately. 1232 * appropriately.
1382 */ 1233 */
1383 if (tmp->container==op) { 1234 if (tmp->container==op) {
1384 CLEAR_FLAG(op, FLAG_APPLIED); 1235 CLEAR_FLAG(op, FLAG_APPLIED);
1385 tmp->container=NULL; 1236 tmp->container=NULL;
1386 } 1237 }
1387 tmp->contr->socket.update_look=1; 1238 tmp->contr->socket.update_look=1;
1388 } 1239 }
1389 /* See if player moving off should effect something */ 1240 /* See if player moving off should effect something */
1390 if (check_walk_off && ((op->move_type & tmp->move_off) && 1241 if (check_walk_off && ((op->move_type & tmp->move_off) &&
1391 (op->move_type & ~tmp->move_off & ~tmp->move_block)==0)) { 1242 (op->move_type & ~tmp->move_off & ~tmp->move_block)==0)) {
1392 1243
1393 move_apply(tmp, op, NULL); 1244 move_apply(tmp, op, NULL);
1394 if (was_destroyed (op, tag)) { 1245 if (was_destroyed (op, tag)) {
1395 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " 1246 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed "
1396 "leaving object\n", tmp->name, tmp->arch->name); 1247 "leaving object\n", &tmp->name, &tmp->arch->name);
1397 } 1248 }
1398 } 1249 }
1399 1250
1400 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1251 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1401 1252
1402 if(tmp->above == tmp) 1253 if(tmp->above == tmp)
1403 tmp->above = NULL; 1254 tmp->above = NULL;
1404 last=tmp; 1255 last=tmp;
1405 } 1256 }
1406 /* last == NULL of there are no objects on this space */ 1257 /* last == NULL of there are no objects on this space */
1407 if (last==NULL) { 1258 if (last==NULL) {
1408 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1259 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1409 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures 1260 * 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 1261 * those out anyways, and if there are any flags set right now, they won't
1411 * be correct anyways. 1262 * be correct anyways.
1412 */ 1263 */
1413 SET_MAP_FLAGS(op->map, op->x, op->y, P_NEED_UPDATE); 1264 SET_MAP_FLAGS(op->map, op->x, op->y, P_NEED_UPDATE);
1414 update_position(op->map, op->x, op->y); 1265 update_position(op->map, op->x, op->y);
1415 } 1266 }
1416 else 1267 else
1417 update_object(last, UP_OBJ_REMOVE); 1268 update_object(last, UP_OBJ_REMOVE);
1418 1269
1419 if(QUERY_FLAG(op,FLAG_BLOCKSVIEW)|| (op->glow_radius != 0)) 1270 if(QUERY_FLAG(op,FLAG_BLOCKSVIEW)|| (op->glow_radius != 0))
1420 update_all_los(op->map, op->x, op->y); 1271 update_all_los(op->map, op->x, op->y);
1421 1272
1422} 1273}
1423 1274
1424/* 1275/*
1425 * merge_ob(op,top): 1276 * merge_ob(op,top):
… …
1491{ 1342{
1492 object *tmp, *top, *floor=NULL; 1343 object *tmp, *top, *floor=NULL;
1493 sint16 x,y; 1344 sint16 x,y;
1494 1345
1495 if (QUERY_FLAG (op, FLAG_FREED)) { 1346 if (QUERY_FLAG (op, FLAG_FREED)) {
1496 LOG (llevError, "Trying to insert freed object!\n"); 1347 LOG (llevError, "Trying to insert freed object!\n");
1497 return NULL; 1348 return NULL;
1498 } 1349 }
1499 if(m==NULL) { 1350 if(m==NULL) {
1500 dump_object(op); 1351 dump_object(op);
1501 LOG(llevError,"Trying to insert in null-map!\n%s\n",errmsg); 1352 LOG(llevError,"Trying to insert in null-map!\n%s\n",errmsg);
1502 return op; 1353 return op;
1503 } 1354 }
1504 if(out_of_map(m,op->x,op->y)) { 1355 if(out_of_map(m,op->x,op->y)) {
1505 dump_object(op); 1356 dump_object(op);
1506 LOG(llevError,"Trying to insert object outside the map.\n%s\n", errmsg); 1357 LOG(llevError,"Trying to insert object outside the map.\n%s\n", errmsg);
1507#ifdef MANY_CORES 1358#ifdef MANY_CORES
1508 /* Better to catch this here, as otherwise the next use of this object 1359 /* 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 1360 * is likely to cause a crash. Better to find out where it is getting
1510 * improperly inserted. 1361 * improperly inserted.
1511 */ 1362 */
1512 abort(); 1363 abort();
1513#endif 1364#endif
1514 return op; 1365 return op;
1515 } 1366 }
1516 if(!QUERY_FLAG(op,FLAG_REMOVED)) { 1367 if(!QUERY_FLAG(op,FLAG_REMOVED)) {
1517 dump_object(op); 1368 dump_object(op);
1518 LOG(llevError,"Trying to insert (map) inserted object.\n%s\n", errmsg); 1369 LOG(llevError,"Trying to insert (map) inserted object.\n%s\n", errmsg);
1519 return op; 1370 return op;
1520 } 1371 }
1521 if(op->more!=NULL) { 1372 if(op->more!=NULL) {
1522 /* The part may be on a different map. */ 1373 /* The part may be on a different map. */
1523 1374
1524 object *more = op->more; 1375 object *more = op->more;
1525 1376
1526 /* We really need the caller to normalize coordinates - if 1377 /* We really need the caller to normalize coordinates - if
1527 * we set the map, that doesn't work if the location is within 1378 * 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 1379 * a map and this is straddling an edge. So only if coordinate
1529 * is clear wrong do we normalize it. 1380 * is clear wrong do we normalize it.
1530 */ 1381 */
1531 if (OUT_OF_REAL_MAP(more->map, more->x, more->y)) { 1382 if (OUT_OF_REAL_MAP(more->map, more->x, more->y)) {
1532 /* Debugging information so you can see the last coordinates this object had */
1533 more->ox = more->x;
1534 more->oy = more->y;
1535 more->map = get_map_from_coord(m, &more->x, &more->y); 1383 more->map = get_map_from_coord(m, &more->x, &more->y);
1536 } else if (!more->map) { 1384 } else if (!more->map) {
1537 /* For backwards compatibility - when not dealing with tiled maps, 1385 /* For backwards compatibility - when not dealing with tiled maps,
1538 * more->map should always point to the parent. 1386 * more->map should always point to the parent.
1539 */ 1387 */
1540 more->map = m; 1388 more->map = m;
1541 } 1389 }
1542 1390
1543 if (insert_ob_in_map(more, more->map, originator, flag) == NULL) { 1391 if (insert_ob_in_map(more, more->map, originator, flag) == NULL) {
1544 if ( ! op->head) 1392 if ( ! op->head)
1545 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1393 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1546 return NULL; 1394 return NULL;
1547 } 1395 }
1548 } 1396 }
1549 CLEAR_FLAG(op,FLAG_REMOVED); 1397 CLEAR_FLAG(op,FLAG_REMOVED);
1550
1551 /* Debugging information so you can see the last coordinates this object had */
1552 op->ox=op->x;
1553 op->oy=op->y;
1554 1398
1555 /* Ideally, the caller figures this out. However, it complicates a lot 1399 /* Ideally, the caller figures this out. However, it complicates a lot
1556 * of areas of callers (eg, anything that uses find_free_spot would now 1400 * of areas of callers (eg, anything that uses find_free_spot would now
1557 * need extra work 1401 * need extra work
1558 */ 1402 */
… …
1561 y = op->y; 1405 y = op->y;
1562 1406
1563 /* this has to be done after we translate the coordinates. 1407 /* this has to be done after we translate the coordinates.
1564 */ 1408 */
1565 if(op->nrof && !(flag & INS_NO_MERGE)) { 1409 if(op->nrof && !(flag & INS_NO_MERGE)) {
1566 for(tmp=GET_MAP_OB(op->map,x,y);tmp!=NULL;tmp=tmp->above) 1410 for(tmp=GET_MAP_OB(op->map,x,y);tmp!=NULL;tmp=tmp->above)
1567 if (CAN_MERGE(op,tmp)) { 1411 if (CAN_MERGE(op,tmp)) {
1568 op->nrof+=tmp->nrof; 1412 op->nrof+=tmp->nrof;
1569 remove_ob(tmp); 1413 remove_ob(tmp);
1570 free_object(tmp); 1414 free_object(tmp);
1571 } 1415 }
1572 } 1416 }
1573 1417
1574 CLEAR_FLAG(op,FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1418 CLEAR_FLAG(op,FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1575 CLEAR_FLAG(op, FLAG_INV_LOCKED); 1419 CLEAR_FLAG(op, FLAG_INV_LOCKED);
1576 if (!QUERY_FLAG(op, FLAG_ALIVE)) 1420 if (!QUERY_FLAG(op, FLAG_ALIVE))
1577 CLEAR_FLAG(op, FLAG_NO_STEAL); 1421 CLEAR_FLAG(op, FLAG_NO_STEAL);
1578 1422
1579 if (flag & INS_BELOW_ORIGINATOR) { 1423 if (flag & INS_BELOW_ORIGINATOR) {
1580 if (originator->map != op->map || originator->x != op->x || 1424 if (originator->map != op->map || originator->x != op->x ||
1581 originator->y != op->y) { 1425 originator->y != op->y) {
1582 LOG(llevError,"insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1426 LOG(llevError,"insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1583 abort(); 1427 abort();
1584 } 1428 }
1585 op->above = originator; 1429 op->above = originator;
1586 op->below = originator->below; 1430 op->below = originator->below;
1587 if (op->below) op->below->above = op; 1431 if (op->below) op->below->above = op;
1588 else SET_MAP_OB(op->map, op->x, op->y, op); 1432 else SET_MAP_OB(op->map, op->x, op->y, op);
1589 /* since *below* originator, no need to update top */ 1433 /* since *below* originator, no need to update top */
1590 originator->below = op; 1434 originator->below = op;
1591 } else { 1435 } else {
1592 /* If there are other objects, then */ 1436 /* If there are other objects, then */
1593 if((! (flag & INS_MAP_LOAD)) && ((top=GET_MAP_OB(op->map,op->x,op->y))!=NULL)) { 1437 if((! (flag & INS_MAP_LOAD)) && ((top=GET_MAP_OB(op->map,op->x,op->y))!=NULL)) {
1594 object *last=NULL; 1438 object *last=NULL;
1595 /* 1439 /*
1596 * If there are multiple objects on this space, we do some trickier handling. 1440 * If there are multiple objects on this space, we do some trickier handling.
1597 * We've already dealt with merging if appropriate. 1441 * We've already dealt with merging if appropriate.
1598 * Generally, we want to put the new object on top. But if 1442 * Generally, we want to put the new object on top. But if
1599 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last 1443 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1600 * floor, we want to insert above that and no further. 1444 * floor, we want to insert above that and no further.
1601 * Also, if there are spell objects on this space, we stop processing 1445 * 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 1446 * 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 1447 * 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 1448 * when lots of spells are cast in one area. Currently, it is presumed
1605 * that flying non pickable objects are spell objects. 1449 * that flying non pickable objects are spell objects.
1606 */ 1450 */
1607 1451
1608 while (top != NULL) { 1452 while (top != NULL) {
1609 if (QUERY_FLAG(top, FLAG_IS_FLOOR) || 1453 if (QUERY_FLAG(top, FLAG_IS_FLOOR) ||
1610 QUERY_FLAG(top, FLAG_OVERLAY_FLOOR)) floor = top; 1454 QUERY_FLAG(top, FLAG_OVERLAY_FLOOR)) floor = top;
1611 if (QUERY_FLAG(top, FLAG_NO_PICK) 1455 if (QUERY_FLAG(top, FLAG_NO_PICK)
1612 && (top->move_type & (MOVE_FLY_LOW |MOVE_FLY_HIGH)) 1456 && (top->move_type & (MOVE_FLY_LOW |MOVE_FLY_HIGH))
1613 && !QUERY_FLAG(top, FLAG_IS_FLOOR)) 1457 && !QUERY_FLAG(top, FLAG_IS_FLOOR))
1614 { 1458 {
1615 /* We insert above top, so we want this object below this */ 1459 /* We insert above top, so we want this object below this */
1616 top=top->below; 1460 top=top->below;
1617 break; 1461 break;
1618 } 1462 }
1619 last = top; 1463 last = top;
1620 top = top->above; 1464 top = top->above;
1621 } 1465 }
1622 /* Don't want top to be NULL, so set it to the last valid object */ 1466 /* Don't want top to be NULL, so set it to the last valid object */
1623 top = last; 1467 top = last;
1624 1468
1625 /* We let update_position deal with figuring out what the space 1469 /* We let update_position deal with figuring out what the space
1626 * looks like instead of lots of conditions here. 1470 * looks like instead of lots of conditions here.
1627 * makes things faster, and effectively the same result. 1471 * makes things faster, and effectively the same result.
1628 */ 1472 */
1629 1473
1630 /* Have object 'fall below' other objects that block view. 1474 /* Have object 'fall below' other objects that block view.
1631 * Unless those objects are exits, type 66 1475 * Unless those objects are exits, type 66
1632 * If INS_ON_TOP is used, don't do this processing 1476 * If INS_ON_TOP is used, don't do this processing
1633 * Need to find the object that in fact blocks view, otherwise 1477 * Need to find the object that in fact blocks view, otherwise
1634 * stacking is a bit odd. 1478 * stacking is a bit odd.
1635 */ 1479 */
1636 if (!(flag & INS_ON_TOP) && 1480 if (!(flag & INS_ON_TOP) &&
1637 (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && 1481 (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) &&
1638 (op->face && !op->face->visibility)) { 1482 (op->face && !op->face->visibility)) {
1639 for (last=top; last != floor; last=last->below) 1483 for (last=top; last != floor; last=last->below)
1640 if (QUERY_FLAG(last, FLAG_BLOCKSVIEW)&&(last->type != EXIT)) break; 1484 if (QUERY_FLAG(last, FLAG_BLOCKSVIEW)&&(last->type != EXIT)) break;
1641 /* Check to see if we found the object that blocks view, 1485 /* Check to see if we found the object that blocks view,
1642 * and make sure we have a below pointer for it so that 1486 * and make sure we have a below pointer for it so that
1643 * we can get inserted below this one, which requires we 1487 * we can get inserted below this one, which requires we
1644 * set top to the object below us. 1488 * set top to the object below us.
1645 */ 1489 */
1646 if (last && last->below && last != floor) top=last->below; 1490 if (last && last->below && last != floor) top=last->below;
1647 } 1491 }
1648 } /* If objects on this space */ 1492 } /* If objects on this space */
1649 if (flag & INS_MAP_LOAD) 1493 if (flag & INS_MAP_LOAD)
1650 top = GET_MAP_TOP(op->map,op->x,op->y); 1494 top = GET_MAP_TOP(op->map,op->x,op->y);
1651 if (flag & INS_ABOVE_FLOOR_ONLY) top = floor; 1495 if (flag & INS_ABOVE_FLOOR_ONLY) top = floor;
1652 1496
1653 /* Top is the object that our object (op) is going to get inserted above. 1497 /* Top is the object that our object (op) is going to get inserted above.
1654 */ 1498 */
1655 1499
1656 /* First object on this space */ 1500 /* First object on this space */
1657 if (!top) { 1501 if (!top) {
1658 op->above = GET_MAP_OB(op->map, op->x, op->y); 1502 op->above = GET_MAP_OB(op->map, op->x, op->y);
1659 if (op->above) op->above->below = op; 1503 if (op->above) op->above->below = op;
1660 op->below = NULL; 1504 op->below = NULL;
1661 SET_MAP_OB(op->map, op->x, op->y, op); 1505 SET_MAP_OB(op->map, op->x, op->y, op);
1662 } else { /* get inserted into the stack above top */ 1506 } else { /* get inserted into the stack above top */
1663 op->above = top->above; 1507 op->above = top->above;
1664 if (op->above) op->above->below = op; 1508 if (op->above) op->above->below = op;
1665 op->below = top; 1509 op->below = top;
1666 top->above = op; 1510 top->above = op;
1667 } 1511 }
1668 if (op->above==NULL) 1512 if (op->above==NULL)
1669 SET_MAP_TOP(op->map,op->x, op->y, op); 1513 SET_MAP_TOP(op->map,op->x, op->y, op);
1670 } /* else not INS_BELOW_ORIGINATOR */ 1514 } /* else not INS_BELOW_ORIGINATOR */
1671 1515
1672 if(op->type==PLAYER) 1516 if(op->type==PLAYER)
1673 op->contr->do_los=1; 1517 op->contr->do_los=1;
1674 1518
1675 /* If we have a floor, we know the player, if any, will be above 1519 /* 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. 1520 * it, so save a few ticks and start from there.
1677 */ 1521 */
1678 if (!(flag & INS_MAP_LOAD)) 1522 if (!(flag & INS_MAP_LOAD))
1679 for(tmp=floor?floor:GET_MAP_OB(op->map,op->x,op->y);tmp!=NULL;tmp=tmp->above) { 1523 for(tmp=floor?floor:GET_MAP_OB(op->map,op->x,op->y);tmp!=NULL;tmp=tmp->above) {
1680 if (tmp->type == PLAYER) 1524 if (tmp->type == PLAYER)
1681 tmp->contr->socket.update_look=1; 1525 tmp->contr->socket.update_look=1;
1682 } 1526 }
1683 1527
1684 /* If this object glows, it may affect lighting conditions that are 1528 /* If this object glows, it may affect lighting conditions that are
1685 * visible to others on this map. But update_all_los is really 1529 * 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 1530 * an inefficient way to do this, as it means los for all players
1687 * on the map will get recalculated. The players could very well 1531 * on the map will get recalculated. The players could very well
… …
1689 * this should get redone to only look for players within range, 1533 * this should get redone to only look for players within range,
1690 * or just updating the P_NEED_UPDATE for spaces within this area 1534 * or just updating the P_NEED_UPDATE for spaces within this area
1691 * of effect may be sufficient. 1535 * of effect may be sufficient.
1692 */ 1536 */
1693 if(MAP_DARKNESS(op->map) && (op->glow_radius != 0)) 1537 if(MAP_DARKNESS(op->map) && (op->glow_radius != 0))
1694 update_all_los(op->map, op->x, op->y); 1538 update_all_los(op->map, op->x, op->y);
1695 1539
1696 1540
1697 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1541 /* updates flags (blocked, alive, no magic, etc) for this map space */
1698 update_object(op,UP_OBJ_INSERT); 1542 update_object(op,UP_OBJ_INSERT);
1699 1543
… …
1709 1553
1710 /* if this is not the head or flag has been passed, don't check walk on status */ 1554 /* if this is not the head or flag has been passed, don't check walk on status */
1711 1555
1712 if (!(flag & INS_NO_WALK_ON) && !op->head) { 1556 if (!(flag & INS_NO_WALK_ON) && !op->head) {
1713 if (check_move_on(op, originator)) 1557 if (check_move_on(op, originator))
1714 return NULL; 1558 return NULL;
1715 1559
1716 /* If we are a multi part object, lets work our way through the check 1560 /* If we are a multi part object, lets work our way through the check
1717 * walk on's. 1561 * walk on's.
1718 */ 1562 */
1719 for (tmp=op->more; tmp!=NULL; tmp=tmp->more) 1563 for (tmp=op->more; tmp!=NULL; tmp=tmp->more)
1720 if (check_move_on (tmp, originator)) 1564 if (check_move_on (tmp, originator))
1721 return NULL; 1565 return NULL;
1722 } 1566 }
1723 return op; 1567 return op;
1724} 1568}
1725 1569
1726/* this function inserts an object in the map, but if it 1570/* this function inserts an object in the map, but if it
… …
1732 object *tmp1; 1576 object *tmp1;
1733 1577
1734 /* first search for itself and remove any old instances */ 1578 /* first search for itself and remove any old instances */
1735 1579
1736 for(tmp=GET_MAP_OB(op->map,op->x,op->y); tmp!=NULL; tmp=tmp->above) { 1580 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 */ { 1581 if(!strcmp(tmp->arch->name,arch_string)) /* same archetype */ {
1738 remove_ob(tmp); 1582 remove_ob(tmp);
1739 free_object(tmp); 1583 free_object(tmp);
1740 } 1584 }
1741 } 1585 }
1742 1586
1743 tmp1=arch_to_object(find_archetype(arch_string)); 1587 tmp1=arch_to_object(find_archetype(arch_string));
1744 1588
1745 1589
… …
1758object *get_split_ob(object *orig_ob, uint32 nr) { 1602object *get_split_ob(object *orig_ob, uint32 nr) {
1759 object *newob; 1603 object *newob;
1760 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1604 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1761 1605
1762 if(orig_ob->nrof<nr) { 1606 if(orig_ob->nrof<nr) {
1763 sprintf(errmsg,"There are only %d %ss.", 1607 sprintf(errmsg,"There are only %d %ss.",
1764 orig_ob->nrof?orig_ob->nrof:1, orig_ob->name); 1608 orig_ob->nrof?orig_ob->nrof:1, &orig_ob->name);
1765 return NULL; 1609 return NULL;
1766 } 1610 }
1767 newob = object_create_clone(orig_ob); 1611 newob = object_create_clone(orig_ob);
1768 if((orig_ob->nrof-=nr)<1) { 1612 if((orig_ob->nrof-=nr)<1) {
1769 if ( ! is_removed) 1613 if ( ! is_removed)
1770 remove_ob(orig_ob); 1614 remove_ob(orig_ob);
1771 free_object2(orig_ob, 1); 1615 free_object2(orig_ob, 1);
1772 } 1616 }
1773 else if ( ! is_removed) { 1617 else if ( ! is_removed) {
1774 if(orig_ob->env!=NULL) 1618 if(orig_ob->env!=NULL)
1775 sub_weight (orig_ob->env,orig_ob->weight*nr); 1619 sub_weight (orig_ob->env,orig_ob->weight*nr);
1776 if (orig_ob->env == NULL && orig_ob->map->in_memory!=MAP_IN_MEMORY) { 1620 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."); 1621 strcpy(errmsg, "Tried to split object whose map is not in memory.");
1778 LOG(llevDebug, 1622 LOG(llevDebug,
1779 "Error, Tried to split object whose map is not in memory.\n"); 1623 "Error, Tried to split object whose map is not in memory.\n");
1780 return NULL; 1624 return NULL;
1781 } 1625 }
1782 } 1626 }
1783 newob->nrof=nr; 1627 newob->nrof=nr;
1784 1628
1785 return newob; 1629 return newob;
1786} 1630}
… …
1808 { 1652 {
1809 op->nrof -= i; 1653 op->nrof -= i;
1810 } 1654 }
1811 else if (op->env != NULL) 1655 else if (op->env != NULL)
1812 { 1656 {
1813 /* is this object in the players inventory, or sub container 1657 /* is this object in the players inventory, or sub container
1814 * therein? 1658 * therein?
1815 */ 1659 */
1816 tmp = is_player_inv (op->env); 1660 tmp = is_player_inv (op->env);
1817 /* nope. Is this a container the player has opened? 1661 /* nope. Is this a container the player has opened?
1818 * If so, set tmp to that player. 1662 * If so, set tmp to that player.
1819 * IMO, searching through all the players will mostly 1663 * IMO, searching through all the players will mostly
1820 * likely be quicker than following op->env to the map, 1664 * likely be quicker than following op->env to the map,
1821 * and then searching the map for a player. 1665 * and then searching the map for a player.
1822 */ 1666 */
1823 if (!tmp) { 1667 if (!tmp) {
1824 for (pl=first_player; pl; pl=pl->next) 1668 for (pl=first_player; pl; pl=pl->next)
1825 if (pl->ob->container == op->env) break; 1669 if (pl->ob->container == op->env) break;
1826 if (pl) tmp=pl->ob; 1670 if (pl) tmp=pl->ob;
1827 else tmp=NULL; 1671 else tmp=NULL;
1828 } 1672 }
1829 1673
1830 if (i < op->nrof) { 1674 if (i < op->nrof) {
1831 sub_weight (op->env, op->weight * i); 1675 sub_weight (op->env, op->weight * i);
1832 op->nrof -= i; 1676 op->nrof -= i;
1833 if (tmp) { 1677 if (tmp) {
… …
1841 } 1685 }
1842 } 1686 }
1843 } 1687 }
1844 else 1688 else
1845 { 1689 {
1846 object *above = op->above; 1690 object *above = op->above;
1847 1691
1848 if (i < op->nrof) { 1692 if (i < op->nrof) {
1849 op->nrof -= i; 1693 op->nrof -= i;
1850 } else { 1694 } else {
1851 remove_ob (op); 1695 remove_ob (op);
1852 op->nrof = 0; 1696 op->nrof = 0;
1853 } 1697 }
1854 /* Since we just removed op, op->above is null */ 1698 /* Since we just removed op, op->above is null */
1855 for (tmp = above; tmp != NULL; tmp = tmp->above) 1699 for (tmp = above; tmp != NULL; tmp = tmp->above)
1856 if (tmp->type == PLAYER) { 1700 if (tmp->type == PLAYER) {
1857 if (op->nrof) 1701 if (op->nrof)
1858 esrv_send_item(tmp, op); 1702 esrv_send_item(tmp, op);
1859 else 1703 else
… …
1911 LOG(llevError,"Trying to put object in NULL.\n%s\n", errmsg); 1755 LOG(llevError,"Trying to put object in NULL.\n%s\n", errmsg);
1912 return op; 1756 return op;
1913 } 1757 }
1914 if (where->head) { 1758 if (where->head) {
1915 LOG(llevDebug, 1759 LOG(llevDebug,
1916 "Warning: Tried to insert object wrong part of multipart object.\n"); 1760 "Warning: Tried to insert object wrong part of multipart object.\n");
1917 where = where->head; 1761 where = where->head;
1918 } 1762 }
1919 if (op->more) { 1763 if (op->more) {
1920 LOG(llevError, "Tried to insert multipart object %s (%d)\n", 1764 LOG(llevError, "Tried to insert multipart object %s (%d)\n",
1921 op->name, op->count); 1765 &op->name, op->count);
1922 return op; 1766 return op;
1923 } 1767 }
1924 CLEAR_FLAG(op, FLAG_OBJ_ORIGINAL); 1768 CLEAR_FLAG(op, FLAG_OBJ_ORIGINAL);
1925 CLEAR_FLAG(op, FLAG_REMOVED); 1769 CLEAR_FLAG(op, FLAG_REMOVED);
1926 if(op->nrof) { 1770 if(op->nrof) {
1927 for(tmp=where->inv;tmp!=NULL;tmp=tmp->below) 1771 for(tmp=where->inv;tmp!=NULL;tmp=tmp->below)
1928 if ( CAN_MERGE(tmp,op) ) { 1772 if ( CAN_MERGE(tmp,op) ) {
1929 /* return the original object and remove inserted object 1773 /* return the original object and remove inserted object
1930 (client needs the original object) */ 1774 (client needs the original object) */
1931 tmp->nrof += op->nrof; 1775 tmp->nrof += op->nrof;
1932 /* Weight handling gets pretty funky. Since we are adding to 1776 /* Weight handling gets pretty funky. Since we are adding to
1933 * tmp->nrof, we need to increase the weight. 1777 * tmp->nrof, we need to increase the weight.
1934 */ 1778 */
1935 add_weight (where, op->weight*op->nrof); 1779 add_weight (where, op->weight*op->nrof);
1936 SET_FLAG(op, FLAG_REMOVED); 1780 SET_FLAG(op, FLAG_REMOVED);
1937 free_object(op); /* free the inserted object */ 1781 free_object(op); /* free the inserted object */
1938 op = tmp; 1782 op = tmp;
1939 remove_ob (op); /* and fix old object's links */ 1783 remove_ob (op); /* and fix old object's links */
1940 CLEAR_FLAG(op, FLAG_REMOVED); 1784 CLEAR_FLAG(op, FLAG_REMOVED);
1941 break; 1785 break;
1942 } 1786 }
1943 1787
1944 /* I assume combined objects have no inventory 1788 /* I assume combined objects have no inventory
1945 * We add the weight - this object could have just been removed 1789 * We add the weight - this object could have just been removed
1946 * (if it was possible to merge). calling remove_ob will subtract 1790 * (if it was possible to merge). calling remove_ob will subtract
… …
1960 op->map=NULL; 1804 op->map=NULL;
1961 op->env=where; 1805 op->env=where;
1962 op->above=NULL; 1806 op->above=NULL;
1963 op->below=NULL; 1807 op->below=NULL;
1964 op->x=0,op->y=0; 1808 op->x=0,op->y=0;
1965 op->ox=0,op->oy=0;
1966 1809
1967 /* reset the light list and los of the players on the map */ 1810 /* reset the light list and los of the players on the map */
1968 if((op->glow_radius!=0)&&where->map) 1811 if((op->glow_radius!=0)&&where->map)
1969 { 1812 {
1970#ifdef DEBUG_LIGHTS 1813#ifdef DEBUG_LIGHTS
1971 LOG(llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", 1814 LOG(llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n",
1972 op->name); 1815 op->name);
1973#endif /* DEBUG_LIGHTS */ 1816#endif /* DEBUG_LIGHTS */
1974 if (MAP_DARKNESS(where->map)) update_all_los(where->map, where->x, where->y); 1817 if (MAP_DARKNESS(where->map)) update_all_los(where->map, where->x, where->y);
1975 } 1818 }
1976 1819
1977 /* Client has no idea of ordering so lets not bother ordering it here. 1820 /* Client has no idea of ordering so lets not bother ordering it here.
… …
2012{ 1855{
2013 object *tmp; 1856 object *tmp;
2014 tag_t tag; 1857 tag_t tag;
2015 mapstruct *m=op->map; 1858 mapstruct *m=op->map;
2016 int x=op->x, y=op->y; 1859 int x=op->x, y=op->y;
2017 MoveType move_on, move_slow, move_block; 1860 MoveType move_on, move_slow, move_block;
2018 1861
2019 if(QUERY_FLAG(op,FLAG_NO_APPLY)) 1862 if(QUERY_FLAG(op,FLAG_NO_APPLY))
2020 return 0; 1863 return 0;
2021 1864
2022 tag = op->count; 1865 tag = op->count;
2023 1866
2024 move_on = GET_MAP_MOVE_ON(op->map, op->x, op->y); 1867 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); 1868 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 1872 * 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 1873 * is set, as lots of objects don't have it set - we treat that
2031 * as walking. 1874 * as walking.
2032 */ 1875 */
2033 if (op->move_type && !(op->move_type & move_on) && !(op->move_type & move_slow)) 1876 if (op->move_type && !(op->move_type & move_on) && !(op->move_type & move_slow))
2034 return 0; 1877 return 0;
2035 1878
2036 /* This is basically inverse logic of that below - basically, 1879 /* This is basically inverse logic of that below - basically,
2037 * if the object can avoid the move on or slow move, they do so, 1880 * 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 1881 * but can't do it if the alternate movement they are using is
2039 * blocked. Logic on this seems confusing, but does seem correct. 1882 * blocked. Logic on this seems confusing, but does seem correct.
2040 */ 1883 */
2041 if ((op->move_type & ~move_on & ~move_block) != 0 && 1884 if ((op->move_type & ~move_on & ~move_block) != 0 &&
2042 (op->move_type & ~move_slow & ~move_block) != 0) return 0; 1885 (op->move_type & ~move_slow & ~move_block) != 0) return 0;
2043 1886
2044 /* The objects have to be checked from top to bottom. 1887 /* The objects have to be checked from top to bottom.
2045 * Hence, we first go to the top: 1888 * Hence, we first go to the top:
2046 */ 1889 */
2047 1890
2048 for (tmp=GET_MAP_OB(op->map, op->x, op->y); tmp!=NULL && 1891 for (tmp=GET_MAP_OB(op->map, op->x, op->y); tmp!=NULL &&
2049 tmp->above!=NULL; tmp=tmp->above) { 1892 tmp->above!=NULL; tmp=tmp->above) {
2050 /* Trim the search when we find the first other spell effect 1893 /* Trim the search when we find the first other spell effect
2051 * this helps performance so that if a space has 50 spell objects, 1894 * this helps performance so that if a space has 50 spell objects,
2052 * we don't need to check all of them. 1895 * we don't need to check all of them.
2053 */ 1896 */
2054 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG(tmp, FLAG_NO_PICK)) break; 1897 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG(tmp, FLAG_NO_PICK)) break;
2055 } 1898 }
2056 for(;tmp!=NULL; tmp=tmp->below) { 1899 for(;tmp!=NULL; tmp=tmp->below) {
2057 if (tmp == op) continue; /* Can't apply yourself */ 1900 if (tmp == op) continue; /* Can't apply yourself */
2058 1901
2059 /* Check to see if one of the movement types should be slowed down. 1902 /* 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 1903 * Second check makes sure that the movement types not being slowed
2061 * (~slow_move) is not blocked on this space - just because the 1904 * (~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 1905 * 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. 1906 * swim on that space, can't use it to avoid the penalty.
2064 */ 1907 */
2065 if (!QUERY_FLAG(op, FLAG_WIZPASS)) { 1908 if (!QUERY_FLAG(op, FLAG_WIZPASS)) {
2066 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1909 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2067 ((op->move_type & tmp->move_slow) && 1910 ((op->move_type & tmp->move_slow) &&
2068 (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) { 1911 (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) {
2069 1912
2070 float diff; 1913 float diff;
2071 1914
2072 diff = tmp->move_slow_penalty*FABS(op->speed); 1915 diff = tmp->move_slow_penalty*FABS(op->speed);
2073 if (op->type == PLAYER) { 1916 if (op->type == PLAYER) {
2074 if ((QUERY_FLAG(tmp, FLAG_IS_HILLY) && find_skill_by_number(op, SK_CLIMBING)) || 1917 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))) { 1918 (QUERY_FLAG(tmp, FLAG_IS_WOODED) && find_skill_by_number(op, SK_WOODSMAN))) {
2076 diff /= 4.0; 1919 diff /= 4.0;
2077 } 1920 }
2078 } 1921 }
2079 op->speed_left -= diff; 1922 op->speed_left -= diff;
2080 } 1923 }
2081 } 1924 }
2082 1925
2083 /* Basically same logic as above, except now for actual apply. */ 1926 /* Basically same logic as above, except now for actual apply. */
2084 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1927 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2085 ((op->move_type & tmp->move_on) && 1928 ((op->move_type & tmp->move_on) &&
2086 (op->move_type & ~tmp->move_on & ~tmp->move_block)==0)) { 1929 (op->move_type & ~tmp->move_on & ~tmp->move_block)==0)) {
2087 1930
2088 move_apply(tmp, op, originator); 1931 move_apply(tmp, op, originator);
2089 if (was_destroyed (op, tag)) 1932 if (was_destroyed (op, tag))
2090 return 1; 1933 return 1;
2091 1934
2092 /* what the person/creature stepped onto has moved the object 1935 /* what the person/creature stepped onto has moved the object
2093 * someplace new. Don't process any further - if we did, 1936 * someplace new. Don't process any further - if we did,
2094 * have a feeling strange problems would result. 1937 * have a feeling strange problems would result.
2095 */ 1938 */
2096 if (op->map != m || op->x != x || op->y != y) return 0; 1939 if (op->map != m || op->x != x || op->y != y) return 0;
2097 } 1940 }
2098 } 1941 }
2099 return 0; 1942 return 0;
2100} 1943}
2101 1944
2102/* 1945/*
… …
2166 2009
2167object *present_in_ob_by_name(int type, const char *str, const object *op) { 2010object *present_in_ob_by_name(int type, const char *str, const object *op) {
2168 object *tmp; 2011 object *tmp;
2169 2012
2170 for(tmp=op->inv; tmp!=NULL; tmp=tmp->below) { 2013 for(tmp=op->inv; tmp!=NULL; tmp=tmp->below) {
2171 if ((type==-1 || tmp->type==type) && (!strcmp(str, tmp->name))) 2014 if ((type==-1 || tmp->type==type) && (!strcmp(str, tmp->name)))
2172 return tmp; 2015 return tmp;
2173 } 2016 }
2174 return NULL; 2017 return NULL;
2175} 2018}
2176 2019
2177/* 2020/*
… …
2247int find_free_spot(const object *ob, mapstruct *m,int x,int y,int start,int stop) { 2090int find_free_spot(const object *ob, mapstruct *m,int x,int y,int start,int stop) {
2248 int i,index=0, flag; 2091 int i,index=0, flag;
2249 static int altern[SIZEOFFREE]; 2092 static int altern[SIZEOFFREE];
2250 2093
2251 for(i=start;i<stop;i++) { 2094 for(i=start;i<stop;i++) {
2252 flag = ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i]); 2095 flag = ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i]);
2253 if(!flag) 2096 if(!flag)
2254 altern[index++]=i; 2097 altern[index++]=i;
2255 2098
2256 /* Basically, if we find a wall on a space, we cut down the search size. 2099 /* 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. 2100 * 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 - 2101 * 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 2102 * 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 2103 * spaces in all the other directions, this will reduce the search space
2261 * to only the spaces immediately surrounding the target area, and 2104 * to only the spaces immediately surrounding the target area, and
2262 * won't look 2 spaces south of the target space. 2105 * won't look 2 spaces south of the target space.
2263 */ 2106 */
2264 else if ((flag & AB_NO_PASS) && maxfree[i]<stop) 2107 else if ((flag & AB_NO_PASS) && maxfree[i]<stop)
2265 stop=maxfree[i]; 2108 stop=maxfree[i];
2266 } 2109 }
2267 if(!index) return -1; 2110 if(!index) return -1;
2268 return altern[RANDOM()%index]; 2111 return altern[RANDOM()%index];
2269} 2112}
2270 2113
… …
2276 */ 2119 */
2277 2120
2278int find_first_free_spot(const object *ob, mapstruct *m,int x,int y) { 2121int find_first_free_spot(const object *ob, mapstruct *m,int x,int y) {
2279 int i; 2122 int i;
2280 for(i=0;i<SIZEOFFREE;i++) { 2123 for(i=0;i<SIZEOFFREE;i++) {
2281 if(!ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i])) 2124 if(!ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i]))
2282 return i; 2125 return i;
2283 } 2126 }
2284 return -1; 2127 return -1;
2285} 2128}
2286 2129
2287/* 2130/*
… …
2293 int i, j, tmp, len; 2136 int i, j, tmp, len;
2294 2137
2295 len = end-begin; 2138 len = end-begin;
2296 for(i = begin; i < end; i++) 2139 for(i = begin; i < end; i++)
2297 { 2140 {
2298 j = begin+RANDOM()%len; 2141 j = begin+RANDOM()%len;
2299 2142
2300 tmp = arr[i]; 2143 tmp = arr[i];
2301 arr[i] = arr[j]; 2144 arr[i] = arr[j];
2302 arr[j] = tmp; 2145 arr[j] = tmp;
2303 } 2146 }
2304} 2147}
2305 2148
2306/* new function to make monster searching more efficient, and effective! 2149/* new function to make monster searching more efficient, and effective!
2307 * This basically returns a randomized array (in the passed pointer) of 2150 * This basically returns a randomized array (in the passed pointer) of
… …
2314{ 2157{
2315 int i; 2158 int i;
2316 2159
2317 for(i = 0; i < SIZEOFFREE; i++) 2160 for(i = 0; i < SIZEOFFREE; i++)
2318 { 2161 {
2319 search_arr[i] = i; 2162 search_arr[i] = i;
2320 } 2163 }
2321 2164
2322 permute(search_arr, 1, SIZEOFFREE1+1); 2165 permute(search_arr, 1, SIZEOFFREE1+1);
2323 permute(search_arr, SIZEOFFREE1+1, SIZEOFFREE2+1); 2166 permute(search_arr, SIZEOFFREE1+1, SIZEOFFREE2+1);
2324 permute(search_arr, SIZEOFFREE2+1, SIZEOFFREE); 2167 permute(search_arr, SIZEOFFREE2+1, SIZEOFFREE);
… …
2340int find_dir(mapstruct *m, int x, int y, object *exclude) { 2183int find_dir(mapstruct *m, int x, int y, object *exclude) {
2341 int i,max=SIZEOFFREE, mflags; 2184 int i,max=SIZEOFFREE, mflags;
2342 sint16 nx, ny; 2185 sint16 nx, ny;
2343 object *tmp; 2186 object *tmp;
2344 mapstruct *mp; 2187 mapstruct *mp;
2345 MoveType blocked, move_type; 2188 MoveType blocked, move_type;
2346 2189
2347 if (exclude && exclude->head) { 2190 if (exclude && exclude->head) {
2348 exclude = exclude->head; 2191 exclude = exclude->head;
2349 move_type = exclude->move_type; 2192 move_type = exclude->move_type;
2350 } else { 2193 } else {
2351 /* If we don't have anything, presume it can use all movement types. */ 2194 /* If we don't have anything, presume it can use all movement types. */
2352 move_type=MOVE_ALL; 2195 move_type=MOVE_ALL;
2353 } 2196 }
2354 2197
2355 for(i=1;i<max;i++) { 2198 for(i=1;i<max;i++) {
2356 mp = m; 2199 mp = m;
2357 nx = x + freearr_x[i]; 2200 nx = x + freearr_x[i];
2358 ny = y + freearr_y[i]; 2201 ny = y + freearr_y[i];
2359 2202
2360 mflags = get_map_flags(m, &mp, nx, ny, &nx, &ny); 2203 mflags = get_map_flags(m, &mp, nx, ny, &nx, &ny);
2361 if (mflags & P_OUT_OF_MAP) { 2204 if (mflags & P_OUT_OF_MAP) {
2362 max = maxfree[i]; 2205 max = maxfree[i];
2363 } else { 2206 } else {
2364 blocked = GET_MAP_MOVE_BLOCK(mp, nx, ny); 2207 blocked = GET_MAP_MOVE_BLOCK(mp, nx, ny);
2365 2208
2366 if ((move_type & blocked) == move_type) { 2209 if ((move_type & blocked) == move_type) {
2367 max=maxfree[i]; 2210 max=maxfree[i];
2368 } else if (mflags & P_IS_ALIVE) { 2211 } else if (mflags & P_IS_ALIVE) {
2369 for (tmp=GET_MAP_OB(mp,nx,ny); tmp!= NULL; tmp=tmp->above) { 2212 for (tmp=GET_MAP_OB(mp,nx,ny); tmp!= NULL; tmp=tmp->above) {
2370 if ((QUERY_FLAG(tmp,FLAG_MONSTER) || tmp->type==PLAYER) && 2213 if ((QUERY_FLAG(tmp,FLAG_MONSTER) || tmp->type==PLAYER) &&
2371 (tmp != exclude ||(tmp->head && tmp->head != exclude))) { 2214 (tmp != exclude ||(tmp->head && tmp->head != exclude))) {
2372 break; 2215 break;
2373 } 2216 }
2374 } 2217 }
2375 if(tmp) { 2218 if(tmp) {
2376 return freedir[i]; 2219 return freedir[i];
2377 } 2220 }
2378 } 2221 }
2379 } 2222 }
2380 } 2223 }
2381 return 0; 2224 return 0;
2382} 2225}
2383 2226
2384/* 2227/*
… …
2548 if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW)) return 0; 2391 if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW)) return 0;
2549 2392
2550 /* yes, can see. */ 2393 /* yes, can see. */
2551 if(dir < 9) return 1; 2394 if(dir < 9) return 1;
2552 return can_see_monsterP(m, x, y, reduction_dir[dir][0]) | 2395 return can_see_monsterP(m, x, y, reduction_dir[dir][0]) |
2553 can_see_monsterP(m,x,y, reduction_dir[dir][1]) | 2396 can_see_monsterP(m,x,y, reduction_dir[dir][1]) |
2554 can_see_monsterP(m,x,y, reduction_dir[dir][2]); 2397 can_see_monsterP(m,x,y, reduction_dir[dir][2]);
2555} 2398}
2556 2399
2557 2400
2558 2401
2559/* 2402/*
2560 * can_pick(picker, item): finds out if an object is possible to be 2403 * 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 2404 * picked up by the picker. Returnes 1 if it can be
2562 * picked up, otherwise 0. 2405 * picked up, otherwise 0.
2563 * 2406 *
… …
2568 */ 2411 */
2569 2412
2570int can_pick(const object *who, const object *item) { 2413int can_pick(const object *who, const object *item) {
2571 return /*QUERY_FLAG(who,FLAG_WIZ)||*/ 2414 return /*QUERY_FLAG(who,FLAG_WIZ)||*/
2572 (item->weight>0&&!QUERY_FLAG(item,FLAG_NO_PICK)&& 2415 (item->weight>0&&!QUERY_FLAG(item,FLAG_NO_PICK)&&
2573 !QUERY_FLAG(item,FLAG_ALIVE)&&!item->invisible && 2416 !QUERY_FLAG(item,FLAG_ALIVE)&&!item->invisible &&
2574 (who->type==PLAYER||item->weight<who->weight/3)); 2417 (who->type==PLAYER||item->weight<who->weight/3));
2575} 2418}
2576 2419
2577 2420
2578/* 2421/*
… …
2603 prev->more = tmp; 2446 prev->more = tmp;
2604 prev = tmp; 2447 prev = tmp;
2605 } 2448 }
2606 /*** copy inventory ***/ 2449 /*** copy inventory ***/
2607 for(item = src->inv; item; item = item->below) { 2450 for(item = src->inv; item; item = item->below) {
2608 (void) insert_ob_in_ob(object_create_clone(item),dst); 2451 (void) insert_ob_in_ob(object_create_clone(item),dst);
2609 } 2452 }
2610 2453
2611 return dst; 2454 return dst;
2612} 2455}
2613 2456
… …
2627/* Also remember that multiparts objects are not supported for now. */ 2470/* Also remember that multiparts objects are not supported for now. */
2628 2471
2629object* load_object_str(const char *obstr) 2472object* load_object_str(const char *obstr)
2630{ 2473{
2631 object *op; 2474 object *op;
2632 FILE *tempfile;
2633 char filename[MAX_BUF]; 2475 char filename[MAX_BUF];
2634 sprintf(filename,"%s/cfloadobstr2044",settings.tmpdir); 2476 sprintf(filename,"%s/cfloadobstr2044",settings.tmpdir);
2477
2635 tempfile=fopen(filename,"w"); 2478 FILE *tempfile=fopen(filename,"w");
2636 if (tempfile == NULL) 2479 if (tempfile == NULL)
2637 { 2480 {
2638 LOG(llevError,"Error - Unable to access load object temp file\n"); 2481 LOG(llevError,"Error - Unable to access load object temp file\n");
2639 return NULL; 2482 return NULL;
2640 }; 2483 };
2641 fprintf(tempfile,obstr); 2484 fprintf(tempfile,obstr);
2642 fclose(tempfile); 2485 fclose(tempfile);
2643 2486
2644 op=get_object(); 2487 op=get_object();
2645 2488
2646 tempfile=fopen(filename,"r"); 2489 object_thawer thawer (filename);
2647 if (tempfile == NULL) 2490 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); 2491 load_object(thawer,op,LO_NEWFILE,0);
2653 LOG(llevDebug," load str completed, object=%s\n",op->name); 2492 LOG(llevDebug," load str completed, object=%s\n", &op->name);
2654 CLEAR_FLAG(op,FLAG_REMOVED); 2493 CLEAR_FLAG(op,FLAG_REMOVED);
2655 fclose(tempfile); 2494
2656 return op; 2495 return op;
2657} 2496}
2658 2497
2659/* This returns the first object in who's inventory that 2498/* This returns the first object in who's inventory that
2660 * has the same type and subtype match. 2499 * has the same type and subtype match.
… …
2663object *find_obj_by_type_subtype(const object *who, int type, int subtype) 2502object *find_obj_by_type_subtype(const object *who, int type, int subtype)
2664{ 2503{
2665 object *tmp; 2504 object *tmp;
2666 2505
2667 for (tmp=who->inv; tmp; tmp=tmp->below) 2506 for (tmp=who->inv; tmp; tmp=tmp->below)
2668 if (tmp->type == type && tmp->subtype == subtype) return tmp; 2507 if (tmp->type == type && tmp->subtype == subtype) return tmp;
2669 2508
2670 return NULL; 2509 return NULL;
2671} 2510}
2672 2511
2673/* If ob has a field named key, return the link from the list, 2512/* If ob has a field named key, return the link from the list,
… …
2697 */ 2536 */
2698const char * get_ob_key_value(const object * op, const char * const key) { 2537const char * get_ob_key_value(const object * op, const char * const key) {
2699 key_value * link; 2538 key_value * link;
2700 const char * canonical_key; 2539 const char * canonical_key;
2701 2540
2702 canonical_key = find_string(key); 2541 canonical_key = shstr::find (key);
2703 2542
2704 if (canonical_key == NULL) { 2543 if (canonical_key == NULL) {
2705 /* 1. There being a field named key on any object 2544 /* 1. There being a field named key on any object
2706 * implies there'd be a shared string to find. 2545 * implies there'd be a shared string to find.
2707 * 2. Since there isn't, no object has this field. 2546 * 2. Since there isn't, no object has this field.
… …
2730 * Unless add_key is TRUE, it won't add fields, only change the value of existing 2569 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2731 * keys. 2570 * keys.
2732 * 2571 *
2733 * Returns TRUE on success. 2572 * Returns TRUE on success.
2734 */ 2573 */
2735int set_ob_key_value_s(object * op, const char * canonical_key, const char * value, int add_key) { 2574int set_ob_key_value_s(object * op, const shstr &canonical_key, const char * value, int add_key) {
2736 key_value * field = NULL, *last=NULL; 2575 key_value * field = NULL, *last=NULL;
2737 2576
2738 for (field=op->key_values; field != NULL; field=field->next) { 2577 for (field=op->key_values; field != NULL; field=field->next) {
2739 if (field->key != canonical_key) { 2578 if (field->key != canonical_key) {
2740 last = field; 2579 last = field;
2741 continue; 2580 continue;
2742 } 2581 }
2743 2582
2744 if (field->value) FREE_AND_CLEAR_STR(field->value); 2583 if (value)
2745 if (value) 2584 field->value = value;
2746 field->value = add_string(value); 2585 else {
2747 else {
2748 /* Basically, if the archetype has this key set, 2586 /* Basically, if the archetype has this key set,
2749 * we need to store the null value so when we save 2587 * we need to store the null value so when we save
2750 * it, we save the empty value so that when we load, 2588 * it, we save the empty value so that when we load,
2751 * we get this value back again. 2589 * we get this value back again.
2752 */ 2590 */
2753 if (get_ob_key_link(&op->arch->clone, canonical_key)) 2591 if (get_ob_key_link (&op->arch->clone, canonical_key))
2754 field->value = NULL; 2592 field->value = 0;
2755 else { 2593 else
2756 /* Delete this link */ 2594 {
2757 if (field->key) FREE_AND_CLEAR_STR(field->key);
2758 if (field->value) FREE_AND_CLEAR_STR(field->value);
2759 if (last) last->next = field->next; 2595 if (last) last->next = field->next;
2760 else op->key_values = field->next; 2596 else op->key_values = field->next;
2761 free(field); 2597
2762 } 2598 delete field;
2763 } 2599 }
2600 }
2764 return TRUE; 2601 return TRUE;
2765 } 2602 }
2766 /* IF we get here, key doesn't exist */ 2603 /* IF we get here, key doesn't exist */
2767 2604
2768 /* No field, we'll have to add it. */ 2605 /* No field, we'll have to add it. */
… …
2776 * be here. If user wants to store empty strings, 2613 * be here. If user wants to store empty strings,
2777 * should pass in "" 2614 * should pass in ""
2778 */ 2615 */
2779 if (value == NULL) return TRUE; 2616 if (value == NULL) return TRUE;
2780 2617
2781 field = (key_value *) malloc(sizeof(key_value)); 2618 field = new key_value;
2782 2619
2783 field->key = add_refcount(canonical_key); 2620 field->key = canonical_key;
2784 field->value = add_string(value); 2621 field->value = value;
2785 /* Usual prepend-addition. */ 2622 /* Usual prepend-addition. */
2786 field->next = op->key_values; 2623 field->next = op->key_values;
2787 op->key_values = field; 2624 op->key_values = field;
2788 2625
2789 return TRUE; 2626 return TRUE;
… …
2796 * and not add new ones. 2633 * and not add new ones.
2797 * In general, should be little reason FALSE is ever passed in for add_key 2634 * In general, should be little reason FALSE is ever passed in for add_key
2798 * 2635 *
2799 * Returns TRUE on success. 2636 * Returns TRUE on success.
2800 */ 2637 */
2801int set_ob_key_value(object * op, const char * key, const char * value, int add_key) { 2638int set_ob_key_value(object * op, const char *key, const char * value, int add_key)
2802 const char * canonical_key = NULL; 2639{
2803 int floating_ref = FALSE; 2640 shstr key_ (key);
2804 int ret;
2805
2806 /* HACK This mess is to make sure set_ob_value() passes a shared string
2807 * to get_ob_key_link(), without leaving a leaked refcount.
2808 */
2809
2810 canonical_key = find_string(key);
2811 if (canonical_key == NULL) {
2812 canonical_key = add_string(key);
2813 floating_ref = TRUE;
2814 }
2815
2816 ret = set_ob_key_value_s(op, canonical_key, value, add_key); 2641 return set_ob_key_value_s (op, key_, value, add_key);
2817
2818 if (floating_ref) {
2819 free_string(canonical_key);
2820 }
2821
2822 return ret;
2823} 2642}

Diff Legend

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