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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.2 by root, Fri Aug 25 17:11:52 2006 UTC vs.
Revision 1.19 by root, Fri Sep 8 17:14:07 2006 UTC

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

Diff Legend

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