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.1 by elmex, Sun Aug 13 17:16:00 2006 UTC vs.
Revision 1.14 by root, Mon Sep 4 11:07:59 2006 UTC

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

Diff Legend

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