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.6 by root, Mon Aug 28 14:05:23 2006 UTC vs.
Revision 1.16 by root, Mon Sep 4 16:46:32 2006 UTC

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

Diff Legend

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