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.4 by root, Sat Aug 26 23:36:30 2006 UTC vs.
Revision 1.22 by root, Sun Sep 10 00:51:23 2006 UTC

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

Diff Legend

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