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.7 by root, Tue Aug 29 05:03:54 2006 UTC vs.
Revision 1.21 by root, Sat Sep 9 21:48:28 2006 UTC

1/* 1/*
2 * static char *rcsid_object_c = 2 * static char *rcsid_object_c =
3 * "$Id: object.C,v 1.7 2006/08/29 05:03:54 root Exp $"; 3 * "$Id: object.C,v 1.21 2006/09/09 21:48:28 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
479
480 439
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 clear_object(op);
552} 493}
553 494
554/* Zero the key_values on op, decrementing the shared-string 495/* Zero the key_values on op, decrementing the shared-string
555 * refcounts and freeing the links. 496 * refcounts and freeing the links.
556 */ 497 */
557static void free_key_values(object * op) { 498static void free_key_values(object * op)
558 key_value * i; 499{
559 key_value * next = NULL; 500 for (key_value *i = op->key_values; i != 0; )
560 501 {
561 if (op->key_values == NULL) return; 502 key_value *next = i->next;
503 delete i;
504 i = next;
562 505 }
563 for (i = op->key_values; i != NULL; i = next) { 506
564 /* Store next *first*. */
565 next = i->next;
566
567 if (i->key) FREE_AND_CLEAR_STR(i->key);
568 if (i->value) FREE_AND_CLEAR_STR(i->value);
569 i->next = NULL;
570 free(i);
571 }
572
573 op->key_values = NULL; 507 op->key_values = 0;
574} 508}
575 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}
576 540
577/* 541/*
578 * clear_object() frees everything allocated by an object, and also 542 * clear_object() frees everything allocated by an object, and also
579 * clears all variables and flags to default settings. 543 * clears all variables and flags to default settings.
580 */ 544 */
581 545
582void clear_object(object *op) { 546void clear_object (object *op)
547{
583 op->clear (); 548 op->clear ();
584 549
585 event *evt;
586 event *evt2;
587
588 /* redo this to be simpler/more efficient. Was also seeing
589 * crashes in the old code. Move this to the top - am
590 * seeing periodic crashes in this code, and would like to have
591 * as much info available as possible (eg, object name).
592 */
593 for (evt = op->events; evt; evt=evt2) {
594 evt2 = evt->next;
595
596 if (evt->hook != NULL) FREE_AND_CLEAR_STR(evt->hook);
597 if (evt->plugin != NULL) FREE_AND_CLEAR_STR(evt->plugin);
598 if (evt->options != NULL) FREE_AND_CLEAR_STR(evt->options);
599
600 free(evt);
601 }
602 op->events = NULL;
603
604 free_key_values(op);
605
606 /* the memset will clear all these values for us, but we need
607 * to reduce the refcount on them.
608 */
609 if (op->name!=NULL) FREE_AND_CLEAR_STR(op->name);
610 if (op->name_pl!=NULL) FREE_AND_CLEAR_STR(op->name_pl);
611 if (op->title != NULL) FREE_AND_CLEAR_STR(op->title);
612 if (op->race!=NULL) FREE_AND_CLEAR_STR(op->race);
613 if (op->slaying!=NULL) FREE_AND_CLEAR_STR(op->slaying);
614 if (op->skill!=NULL) FREE_AND_CLEAR_STR(op->skill);
615 if (op->msg!=NULL) FREE_AND_CLEAR_STR(op->msg);
616 if (op->lore!=NULL) FREE_AND_CLEAR_STR(op->lore);
617 if (op->materialname!= NULL) FREE_AND_CLEAR_STR(op->materialname);
618
619
620 memset((void*)op, 0, sizeof (object_special));
621 /* Below here, we clear things that are not done by the memset,
622 * or set default values that are not zero.
623 */
624 /* This is more or less true */
625 SET_FLAG(op, FLAG_REMOVED);
626
627
628 op->contr = NULL; 550 op->contr = NULL;
629 op->below=NULL; 551 op->below = NULL;
630 op->above=NULL; 552 op->above = NULL;
631 op->inv=NULL; 553 op->inv = NULL;
632 op->events=NULL;
633 op->container=NULL; 554 op->container=NULL;
634 op->env=NULL; 555 op->env=NULL;
635 op->more=NULL; 556 op->more=NULL;
636 op->head=NULL; 557 op->head=NULL;
637 op->map=NULL; 558 op->map=NULL;
638 op->refcount=0; 559 op->refcount=0;
639 op->active_next = NULL; 560 op->active_next = NULL;
640 op->active_prev = NULL; 561 op->active_prev = NULL;
641 /* What is not cleared is next, prev, and count */ 562 /* What is not cleared is next, prev, and count */
642 563
643 op->expmul=1.0; 564 op->expmul = 1.0;
644 op->face = blank_face; 565 op->face = blank_face;
645 op->attacked_by_count = (tag_t) -1; 566 op->attacked_by_count = -1;
567
646 if (settings.casting_time) 568 if (settings.casting_time)
647 op->casting_time = -1; 569 op->casting_time = -1;
648
649} 570}
650 571
651/* 572/*
652 * copy object first frees everything allocated by the second object, 573 * copy object first frees everything allocated by the second object,
653 * 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
… …
655 * 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,
656 * 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
657 * will point at garbage. 578 * will point at garbage.
658 */ 579 */
659 580
660void copy_object(object *op2, object *op) { 581void copy_object (object *op2, object *op)
661 int is_freed=QUERY_FLAG(op,FLAG_FREED),is_removed=QUERY_FLAG(op,FLAG_REMOVED); 582{
662 event *evt, *evt2, *evt_new; 583 bool is_freed = QUERY_FLAG (op, FLAG_FREED);
584 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
663 585
664 op->clear ();
665
666 /* Decrement the refcounts, but don't bother zeroing the fields;
667 they'll be overwritten by memcpy. */
668 if(op->name!=NULL) free_string(op->name);
669 if(op->name_pl!=NULL) free_string(op->name_pl);
670 if(op->title!=NULL) free_string(op->title);
671 if(op->race!=NULL) free_string(op->race);
672 if(op->slaying!=NULL) free_string(op->slaying);
673 if(op->skill!=NULL) free_string(op->skill);
674 if(op->msg!=NULL) free_string(op->msg);
675 if(op->lore!=NULL) free_string(op->lore);
676 if(op->materialname != NULL) free_string(op->materialname);
677 if(op->custom_name != NULL) free_string(op->custom_name);
678
679 /* Basically, same code as from clear_object() */
680 for (evt = op->events; evt; evt=evt2) {
681 evt2 = evt->next;
682
683 if (evt->hook != NULL) FREE_AND_CLEAR_STR(evt->hook);
684 if (evt->plugin != NULL) FREE_AND_CLEAR_STR(evt->plugin);
685 if (evt->options != NULL) FREE_AND_CLEAR_STR(evt->options);
686
687 free(evt);
688 }
689 op->events = NULL;
690
691 free_key_values(op);
692
693 *(object_special *)op = *(object_special *)op2;
694 op2->clone (op); 586 op2->clone (op);
695 587
696 if(is_freed) SET_FLAG(op,FLAG_FREED); 588 if (is_freed) SET_FLAG (op, FLAG_FREED);
697 if(is_removed) SET_FLAG(op,FLAG_REMOVED); 589 if (is_removed) SET_FLAG (op, FLAG_REMOVED);
698 if(op->name!=NULL) add_refcount(op->name);
699 if(op->name_pl!=NULL) add_refcount(op->name_pl);
700 if(op->title!=NULL) add_refcount(op->title);
701 if(op->race!=NULL) add_refcount(op->race);
702 if(op->slaying!=NULL) add_refcount(op->slaying);
703 if(op->skill!=NULL) add_refcount(op->skill);
704 if(op->lore!=NULL) add_refcount(op->lore);
705 if(op->msg!=NULL) add_refcount(op->msg);
706 if(op->custom_name!=NULL) add_refcount(op->custom_name);
707 if (op->materialname != NULL) add_refcount(op->materialname);
708 590
709 if((op2->speed<0) && !editor) 591 if (op2->speed < 0)
710 op->speed_left=op2->speed_left-RANDOM()%200/100.0; 592 op->speed_left = op2->speed_left - RANDOM() % 200 / 100.0;
711 593
712 /* Copy over event information */
713 evt2 = NULL;
714 for (evt = op2->events; evt; evt=evt->next) {
715 evt_new = (event *) malloc(sizeof(event));
716 memcpy(evt_new, evt, sizeof(event));
717 if (evt_new->hook) add_refcount(evt_new->hook);
718 if (evt_new->plugin) add_refcount(evt_new->plugin);
719 if (evt_new->options) add_refcount(evt_new->options);
720 evt_new->next = NULL;
721
722 /* Try to be a little clever here, and store away the
723 * last event we copied, so that its simpler to update the
724 * pointer.
725 */
726 if (evt2)
727 evt2->next = evt_new;
728 else
729 op->events = evt_new;
730
731 evt2 = evt_new;
732 }
733 /* Copy over key_values, if any. */ 594 /* Copy over key_values, if any. */
734 if (op2->key_values != NULL) { 595 if (op2->key_values != NULL)
596 {
735 key_value * tail = NULL; 597 key_value *tail = NULL;
736 key_value * i; 598 key_value *i;
737 599
738 op->key_values = NULL; 600 op->key_values = NULL;
739 601
740 for (i = op2->key_values; i != NULL; i = i->next) { 602 for (i = op2->key_values; i != NULL; i = i->next)
741 key_value * new_link = (key_value *) malloc(sizeof(key_value)); 603 {
604 key_value *new_link = new key_value;
742 605
743 new_link->next = NULL; 606 new_link->next = NULL;
744 new_link->key = add_refcount(i->key); 607 new_link->key = i->key;
745 if (i->value) 608 new_link->value = i->value;
746 new_link->value = add_refcount(i->value);
747 else
748 new_link->value = NULL;
749 609
750 /* Try and be clever here, too. */ 610 /* Try and be clever here, too. */
751 if (op->key_values == NULL) { 611 if (op->key_values == NULL)
612 {
752 op->key_values = new_link; 613 op->key_values = new_link;
753 tail = new_link; 614 tail = new_link;
754 } else { 615 }
755 tail->next = new_link; 616 else
756 tail = new_link; 617 {
618 tail->next = new_link;
619 tail = new_link;
620 }
621 }
757 } 622 }
758 }
759 }
760 623
761 update_ob_speed(op); 624 update_ob_speed (op);
762}
763
764/*
765 * expand_objects() allocates more objects for the list of unused objects.
766 * It is called from get_object() if the unused list is empty.
767 */
768
769void expand_objects(void) {
770 int i;
771 object *obj;
772 obj = (object *) CALLOC(OBJ_EXPAND,sizeof(object));
773
774 if(obj==NULL)
775 fatal(OUT_OF_MEMORY);
776 free_objects=obj;
777 obj[0].prev=NULL;
778 obj[0].next= &obj[1],
779 SET_FLAG(&(obj[0]), FLAG_REMOVED);
780 SET_FLAG(&(obj[0]), FLAG_FREED);
781
782 for(i=1;i<OBJ_EXPAND-1;i++) {
783 obj[i].next= &obj[i+1],
784 obj[i].prev= &obj[i-1],
785 SET_FLAG(&(obj[i]), FLAG_REMOVED);
786 SET_FLAG(&(obj[i]), FLAG_FREED);
787 }
788 obj[OBJ_EXPAND-1].prev= &obj[OBJ_EXPAND-2],
789 obj[OBJ_EXPAND-1].next=NULL,
790 SET_FLAG(&(obj[OBJ_EXPAND-1]), FLAG_REMOVED);
791 SET_FLAG(&(obj[OBJ_EXPAND-1]), FLAG_FREED);
792
793 nrofallocobjects += OBJ_EXPAND;
794 nroffreeobjects += OBJ_EXPAND;
795}
796
797/*
798 * get_object() grabs an object from the list of unused objects, makes
799 * sure it is initialised, and returns it.
800 * If there are no free objects, expand_objects() is called to get more.
801 */
802
803object *get_object(void) {
804 object *op;
805
806 if(free_objects==NULL) {
807 expand_objects();
808 }
809 op=free_objects;
810#ifdef MEMORY_DEBUG
811 /* The idea is hopefully by doing a realloc, the memory
812 * debugging program will now use the current stack trace to
813 * report leaks.
814 */
815 op = realloc(op, sizeof(object));
816 SET_FLAG(op, FLAG_REMOVED);
817 SET_FLAG(op, FLAG_FREED);
818#endif
819
820 if(!QUERY_FLAG(op,FLAG_FREED)) {
821 LOG(llevError,"Fatal: Getting busy object.\n");
822 }
823 free_objects=op->next;
824 if(free_objects!=NULL)
825 free_objects->prev=NULL;
826 op->count= ++ob_count;
827 op->name=NULL;
828 op->name_pl=NULL;
829 op->title=NULL;
830 op->race=NULL;
831 op->slaying=NULL;
832 op->skill = NULL;
833 op->lore=NULL;
834 op->msg=NULL;
835 op->materialname=NULL;
836 op->next=objects;
837 op->prev=NULL;
838 op->active_next = NULL;
839 op->active_prev = NULL;
840 if(objects!=NULL)
841 objects->prev=op;
842 objects=op;
843 clear_object(op);
844 SET_FLAG(op,FLAG_REMOVED);
845 nroffreeobjects--;
846 return op;
847} 625}
848 626
849/* 627/*
850 * 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
851 * 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
852 * 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.
853 */ 631 */
854 632
855void update_turn_face(object *op) { 633void update_turn_face(object *op) {
856 if(!QUERY_FLAG(op,FLAG_IS_TURNABLE)||op->arch==NULL) 634 if(!QUERY_FLAG(op,FLAG_IS_TURNABLE)||op->arch==NULL)
857 return; 635 return;
858 SET_ANIMATION(op, op->direction); 636 SET_ANIMATION(op, op->direction);
859 update_object(op,UP_OBJ_FACE); 637 update_object(op,UP_OBJ_FACE);
860} 638}
861 639
862/* 640/*
… …
871 /* No reason putting the archetypes objects on the speed list, 649 /* No reason putting the archetypes objects on the speed list,
872 * since they never really need to be updated. 650 * since they never really need to be updated.
873 */ 651 */
874 652
875 if (QUERY_FLAG(op, FLAG_FREED) && op->speed) { 653 if (QUERY_FLAG(op, FLAG_FREED) && op->speed) {
876 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);
877#ifdef MANY_CORES 655#ifdef MANY_CORES
878 abort(); 656 abort();
879#else 657#else
880 op->speed = 0; 658 op->speed = 0;
881#endif 659#endif
882 } 660 }
883 if (arch_init) { 661 if (arch_init) {
884 return; 662 return;
885 } 663 }
886 if (FABS(op->speed)>MIN_ACTIVE_SPEED) { 664 if (FABS(op->speed)>MIN_ACTIVE_SPEED) {
887 /* If already on active list, don't do anything */ 665 /* If already on active list, don't do anything */
888 if (op->active_next || op->active_prev || op==active_objects) 666 if (op->active_next || op->active_prev || op==active_objects)
889 return; 667 return;
890 668
891 /* process_events() expects us to insert the object at the beginning 669 /* process_events() expects us to insert the object at the beginning
892 * of the list. */ 670 * of the list. */
893 op->active_next = active_objects; 671 op->active_next = active_objects;
894 if (op->active_next!=NULL) 672 if (op->active_next!=NULL)
895 op->active_next->active_prev = op; 673 op->active_next->active_prev = op;
896 active_objects = op; 674 active_objects = op;
897 } 675 }
898 else { 676 else {
899 /* If not on the active list, nothing needs to be done */ 677 /* If not on the active list, nothing needs to be done */
900 if (!op->active_next && !op->active_prev && op!=active_objects) 678 if (!op->active_next && !op->active_prev && op!=active_objects)
901 return; 679 return;
902 680
903 if (op->active_prev==NULL) { 681 if (op->active_prev==NULL) {
904 active_objects = op->active_next; 682 active_objects = op->active_next;
905 if (op->active_next!=NULL) 683 if (op->active_next!=NULL)
906 op->active_next->active_prev = NULL; 684 op->active_next->active_prev = NULL;
907 } 685 }
908 else { 686 else {
909 op->active_prev->active_next = op->active_next; 687 op->active_prev->active_next = op->active_next;
910 if (op->active_next) 688 if (op->active_next)
911 op->active_next->active_prev = op->active_prev; 689 op->active_next->active_prev = op->active_prev;
912 } 690 }
913 op->active_next = NULL; 691 op->active_next = NULL;
914 op->active_prev = NULL; 692 op->active_prev = NULL;
915 } 693 }
916} 694}
917 695
918/* This function removes object 'op' from the list of active 696/* This function removes object 'op' from the list of active
919 * objects. 697 * objects.
… …
925 */ 703 */
926void remove_from_active_list(object *op) 704void remove_from_active_list(object *op)
927{ 705{
928 /* If not on the active list, nothing needs to be done */ 706 /* If not on the active list, nothing needs to be done */
929 if (!op->active_next && !op->active_prev && op!=active_objects) 707 if (!op->active_next && !op->active_prev && op!=active_objects)
930 return; 708 return;
931 709
932 if (op->active_prev==NULL) { 710 if (op->active_prev==NULL) {
933 active_objects = op->active_next; 711 active_objects = op->active_next;
934 if (op->active_next!=NULL) 712 if (op->active_next!=NULL)
935 op->active_next->active_prev = NULL; 713 op->active_next->active_prev = NULL;
936 } 714 }
937 else { 715 else {
938 op->active_prev->active_next = op->active_next; 716 op->active_prev->active_next = op->active_next;
939 if (op->active_next) 717 if (op->active_next)
940 op->active_next->active_prev = op->active_prev; 718 op->active_next->active_prev = op->active_prev;
941 } 719 }
942 op->active_next = NULL; 720 op->active_next = NULL;
943 op->active_prev = NULL; 721 op->active_prev = NULL;
944} 722}
945 723
… …
965 * UP_OBJ_FACE: only the objects face has changed. 743 * UP_OBJ_FACE: only the objects face has changed.
966 */ 744 */
967 745
968void update_object(object *op, int action) { 746void update_object(object *op, int action) {
969 int update_now=0, flags; 747 int update_now=0, flags;
970 MoveType move_on, move_off, move_block, move_slow; 748 MoveType move_on, move_off, move_block, move_slow;
971 749
972 if (op == NULL) { 750 if (op == NULL) {
973 /* this should never happen */ 751 /* this should never happen */
974 LOG(llevDebug,"update_object() called for NULL object.\n"); 752 LOG(llevDebug,"update_object() called for NULL object.\n");
975 return; 753 return;
976 } 754 }
977 755
978 if(op->env!=NULL) { 756 if(op->env!=NULL) {
979 /* Animation is currently handled by client, so nothing 757 /* Animation is currently handled by client, so nothing
980 * to do in this case. 758 * to do in this case.
981 */ 759 */
982 return; 760 return;
983 } 761 }
984 762
985 /* 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
986 * going to get freed anyways. 764 * going to get freed anyways.
987 */ 765 */
988 if (!op->map || op->map->in_memory == MAP_SAVING) return; 766 if (!op->map || op->map->in_memory == MAP_SAVING) return;
989 767
990 /* make sure the object is within map boundaries */ 768 /* make sure the object is within map boundaries */
991 if (op->x < 0 || op->x >= MAP_WIDTH(op->map) || 769 if (op->x < 0 || op->x >= MAP_WIDTH(op->map) ||
992 op->y < 0 || op->y >= MAP_HEIGHT(op->map)) { 770 op->y < 0 || op->y >= MAP_HEIGHT(op->map)) {
993 LOG(llevError,"update_object() called for object out of map!\n"); 771 LOG(llevError,"update_object() called for object out of map!\n");
994#ifdef MANY_CORES 772#ifdef MANY_CORES
995 abort(); 773 abort();
996#endif 774#endif
997 return; 775 return;
998 } 776 }
999 777
1000 flags = GET_MAP_FLAGS(op->map, op->x, op->y); 778 flags = GET_MAP_FLAGS(op->map, op->x, op->y);
1001 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);
1002 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);
… …
1015 update_now=1; 793 update_now=1;
1016 794
1017 if (QUERY_FLAG(op, FLAG_ALIVE) && !(flags & P_IS_ALIVE)) 795 if (QUERY_FLAG(op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
1018 update_now=1; 796 update_now=1;
1019 797
798 if (op->type == SAFE_GROUND && !(flags & P_SAFE))
799 update_now=1;
800
1020 if ((move_on | op->move_on) != move_on) update_now=1; 801 if ((move_on | op->move_on) != move_on) update_now=1;
802
1021 if ((move_off | op->move_off) != move_off) update_now=1; 803 if ((move_off | op->move_off) != move_off) update_now=1;
804
1022 /* 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
1023 * to have move_allow right now. 806 * to have move_allow right now.
1024 */ 807 */
1025 if (((move_block | op->move_block) & ~op->move_allow) != move_block) 808 if (((move_block | op->move_block) & ~op->move_allow) != move_block)
1026 update_now=1; 809 update_now=1;
810
1027 if ((move_slow | op->move_slow) != move_slow) update_now=1; 811 if ((move_slow | op->move_slow) != move_slow)
812 update_now=1;
1028 } 813 }
1029 /* if the object is being removed, we can't make intelligent 814 /* if the object is being removed, we can't make intelligent
1030 * decisions, because remove_ob can't really pass the object 815 * decisions, because remove_ob can't really pass the object
1031 * that is being removed. 816 * that is being removed.
1032 */ 817 */
1033 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) { 818 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) {
1034 update_now=1; 819 update_now=1;
1035 } else if (action == UP_OBJ_FACE) { 820 } else if (action == UP_OBJ_FACE) {
1036 /* Nothing to do for that case */ 821 /* Nothing to do for that case */
1037 } 822 }
1038 else { 823 else {
1039 LOG(llevError,"update_object called with invalid action: %d\n", action); 824 LOG(llevError,"update_object called with invalid action: %d\n", action);
1040 } 825 }
1041 826
1042 if (update_now) { 827 if (update_now) {
1043 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);
1044 update_position(op->map, op->x, op->y); 829 update_position(op->map, op->x, op->y);
1045 } 830 }
1046 831
1047 if(op->more!=NULL) 832 if(op->more!=NULL)
1048 update_object(op->more, action); 833 update_object(op->more, action);
1049} 834}
1050 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 count = ++ob_count;
849
850 prev = 0;
851 next = objects;
852
853 if (objects)
854 objects->prev = this;
855
856 objects = this;
857
858 SET_FLAG (this, FLAG_REMOVED);
859
860 expmul = 1.0;
861 face = blank_face;
862 attacked_by_count = -1;
863}
864
865object::~object ()
866{
867}
868
869object *object::create ()
870{
871 return new object;
872}
1051 873
1052/* 874/*
1053 * free_object() frees everything allocated by an object, removes 875 * free_object() frees everything allocated by an object, removes
1054 * it from the list of used objects, and puts it on the list of 876 * it from the list of used objects, and puts it on the list of
1055 * free objects. The IS_FREED() flag is set in the object. 877 * free objects. The IS_FREED() flag is set in the object.
… …
1057 * this function to succeed. 879 * this function to succeed.
1058 * 880 *
1059 * If free_inventory is set, free inventory as well. Else drop items in 881 * If free_inventory is set, free inventory as well. Else drop items in
1060 * inventory to the ground. 882 * inventory to the ground.
1061 */ 883 */
1062 884void
1063void free_object(object *ob) { 885object::free (bool free_inventory)
1064 free_object2(ob, 0); 886{
1065}
1066void free_object2(object *ob, int free_inventory) {
1067 object *tmp,*op;
1068
1069 ob->clear ();
1070
1071 if (!QUERY_FLAG(ob,FLAG_REMOVED)) { 887 if (!QUERY_FLAG (this, FLAG_REMOVED))
888 {
1072 LOG(llevDebug,"Free object called with non removed object\n"); 889 LOG (llevDebug, "Free object called with non removed object\n");
1073 dump_object(ob); 890 dump_object (this);
1074#ifdef MANY_CORES 891#ifdef MANY_CORES
1075 abort(); 892 abort ();
1076#endif 893#endif
1077 } 894 }
895
1078 if(QUERY_FLAG(ob,FLAG_FRIENDLY)) { 896 if (QUERY_FLAG (this, FLAG_FRIENDLY))
897 {
1079 LOG(llevMonster,"Warning: tried to free friendly object.\n"); 898 LOG (llevMonster, "Warning: tried to free friendly object.\n");
1080 remove_friendly_object(ob); 899 remove_friendly_object (this);
1081 } 900 }
901
1082 if(QUERY_FLAG(ob,FLAG_FREED)) { 902 if (QUERY_FLAG (this, FLAG_FREED))
1083 dump_object(ob); 903 {
904 dump_object (this);
1084 LOG(llevError,"Trying to free freed object.\n%s\n",errmsg); 905 LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1085 return; 906 return;
907 }
908
909 if (more)
1086 } 910 {
1087 if(ob->more!=NULL) { 911 more->free (free_inventory);
1088 free_object2(ob->more, free_inventory); 912 more = 0;
1089 ob->more=NULL; 913 }
914
915 if (inv)
1090 } 916 {
1091 if (ob->inv) {
1092 /* Only if the space blocks everything do we not process - 917 /* Only if the space blocks everything do we not process -
1093 * if some form of movemnt is allowed, let objects 918 * if some form of movement is allowed, let objects
1094 * drop on that space. 919 * drop on that space.
1095 */ 920 */
1096 if (free_inventory || ob->map==NULL || ob->map->in_memory!=MAP_IN_MEMORY || 921 if (free_inventory || !map
922 || map->in_memory != MAP_IN_MEMORY
1097 (GET_MAP_MOVE_BLOCK(ob->map, ob->x, ob->y) == MOVE_ALL)) 923 || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))
1098 { 924 {
1099 op=ob->inv; 925 object *op = inv;
1100 while(op!=NULL) { 926
1101 tmp=op->below; 927 while (op)
928 {
929 object *tmp = op->below;
1102 remove_ob(op); 930 remove_ob (op);
1103 free_object2(op, free_inventory); 931 op->free (free_inventory);
1104 op=tmp; 932 op = tmp;
1105 } 933 }
1106 } 934 }
935 else
1107 else { /* Put objects in inventory onto this space */ 936 { /* Put objects in inventory onto this space */
1108 op=ob->inv; 937 object *op = inv;
1109 while(op!=NULL) { 938
1110 tmp=op->below; 939 while (op)
940 {
941 object *tmp = op->below;
1111 remove_ob(op); 942 remove_ob (op);
1112 if(QUERY_FLAG(op,FLAG_STARTEQUIP)||QUERY_FLAG(op,FLAG_NO_DROP) || 943
944 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
945 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE
1113 op->type==RUNE || op->type==TRAP || QUERY_FLAG(op,FLAG_IS_A_TEMPLATE)) 946 || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1114 free_object(op); 947 free_object (op);
1115 else { 948 else
949 {
1116 op->x=ob->x; 950 op->x = x;
1117 op->y=ob->y; 951 op->y = y;
1118 insert_ob_in_map(op,ob->map,NULL,0); /* Insert in same map as the envir */ 952 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
1119 } 953 }
1120 op=tmp; 954
955 op = tmp;
1121 } 956 }
1122 } 957 }
1123 } 958 }
959
1124 /* Remove object from the active list */ 960 /* Remove object from the active list */
1125 ob->speed = 0; 961 speed = 0;
1126 update_ob_speed(ob); 962 update_ob_speed (this);
1127 963
1128 SET_FLAG(ob, FLAG_FREED); 964 SET_FLAG (this, FLAG_FREED);
965
966 mortalise ();
967}
968
969void
970object::mortalise ()
971{
1129 ob->count = 0; 972 count = 0;
1130 973
1131 /* Remove this object from the list of used objects */ 974 /* Remove this object from the list of used objects */
1132 if(ob->prev==NULL) { 975 if (prev) prev->next = next;
1133 objects=ob->next; 976 if (next) next->prev = prev;
1134 if(objects!=NULL) 977 if (this == objects) objects = next;
1135 objects->prev=NULL;
1136 }
1137 else {
1138 ob->prev->next=ob->next;
1139 if(ob->next!=NULL)
1140 ob->next->prev=ob->prev;
1141 }
1142
1143 if(ob->name!=NULL) FREE_AND_CLEAR_STR(ob->name);
1144 if(ob->name_pl!=NULL) FREE_AND_CLEAR_STR(ob->name_pl);
1145 if(ob->title!=NULL) FREE_AND_CLEAR_STR(ob->title);
1146 if(ob->race!=NULL) FREE_AND_CLEAR_STR(ob->race);
1147 if(ob->slaying!=NULL) FREE_AND_CLEAR_STR(ob->slaying);
1148 if(ob->skill!=NULL) FREE_AND_CLEAR_STR(ob->skill);
1149 if(ob->lore!=NULL) FREE_AND_CLEAR_STR(ob->lore);
1150 if(ob->msg!=NULL) FREE_AND_CLEAR_STR(ob->msg);
1151 if(ob->materialname!=NULL) FREE_AND_CLEAR_STR(ob->materialname);
1152 978
1153
1154 /* Why aren't events freed? */
1155 free_key_values(ob); 979 free_key_values (this);
1156 980
1157#if 0 /* MEMORY_DEBUG*/ 981 mortals.push_back (this);
1158 /* This is a nice idea. Unfortunately, a lot of the code in crossfire
1159 * presumes the freed_object will stick around for at least a little
1160 * bit
1161 */
1162 /* this is necessary so that memory debugging programs will
1163 * be able to accurately report source of malloc. If we recycle
1164 * objects, then some other area may be doing the get_object
1165 * and not freeing it, but the original one that malloc'd the
1166 * object will get the blame.
1167 */
1168 free(ob);
1169#else
1170
1171 /* Now link it with the free_objects list: */
1172 ob->prev=NULL;
1173 ob->next=free_objects;
1174 if(free_objects!=NULL)
1175 free_objects->prev=ob;
1176 free_objects=ob;
1177 nroffreeobjects++;
1178#endif
1179}
1180
1181/*
1182 * count_free() returns the number of objects on the list of free objects.
1183 */
1184
1185int count_free(void) {
1186 int i=0;
1187 object *tmp=free_objects;
1188 while(tmp!=NULL)
1189 tmp=tmp->next, i++;
1190 return i;
1191}
1192
1193/*
1194 * count_used() returns the number of objects on the list of used objects.
1195 */
1196
1197int count_used(void) {
1198 int i=0;
1199 object *tmp=objects;
1200 while(tmp!=NULL)
1201 tmp=tmp->next, i++;
1202 return i;
1203}
1204
1205/*
1206 * count_active() returns the number of objects on the list of active objects.
1207 */
1208
1209int count_active(void) {
1210 int i=0;
1211 object *tmp=active_objects;
1212 while(tmp!=NULL)
1213 tmp=tmp->active_next, i++;
1214 return i;
1215} 982}
1216 983
1217/* 984/*
1218 * sub_weight() recursively (outwards) subtracts a number from the 985 * sub_weight() recursively (outwards) subtracts a number from the
1219 * weight of an object (and what is carried by it's environment(s)). 986 * weight of an object (and what is carried by it's environment(s)).
… …
1246 mapstruct *m; 1013 mapstruct *m;
1247 sint16 x,y; 1014 sint16 x,y;
1248 1015
1249 1016
1250 if(QUERY_FLAG(op,FLAG_REMOVED)) { 1017 if(QUERY_FLAG(op,FLAG_REMOVED)) {
1251 dump_object(op); 1018 dump_object(op);
1252 LOG(llevError,"Trying to remove removed object.\n%s\n",errmsg); 1019 LOG(llevError,"Trying to remove removed object.\n%s\n",errmsg);
1253 1020
1254 /* Changed it to always dump core in this case. As has been learned 1021 /* Changed it to always dump core in this case. As has been learned
1255 * in the past, trying to recover from errors almost always 1022 * in the past, trying to recover from errors almost always
1256 * make things worse, and this is a real error here - something 1023 * make things worse, and this is a real error here - something
1257 * that should not happen. 1024 * that should not happen.
1258 * Yes, if this was a mission critical app, trying to do something 1025 * Yes, if this was a mission critical app, trying to do something
1259 * to recover may make sense, but that is because failure of the app 1026 * to recover may make sense, but that is because failure of the app
1260 * may have other disastrous problems. Cf runs out of a script 1027 * may have other disastrous problems. Cf runs out of a script
1261 * so is easily enough restarted without any real problems. 1028 * so is easily enough restarted without any real problems.
1262 * MSW 2001-07-01 1029 * MSW 2001-07-01
1263 */ 1030 */
1264 abort(); 1031 abort();
1265 } 1032 }
1266 if(op->more!=NULL) 1033 if(op->more!=NULL)
1267 remove_ob(op->more); 1034 remove_ob(op->more);
1268 1035
1269 SET_FLAG(op, FLAG_REMOVED); 1036 SET_FLAG(op, FLAG_REMOVED);
1270 1037
1271 /* 1038 /*
1272 * In this case, the object to be removed is in someones 1039 * In this case, the object to be removed is in someones
1273 * inventory. 1040 * inventory.
1274 */ 1041 */
1275 if(op->env!=NULL) { 1042 if(op->env!=NULL) {
1276 if(op->nrof) 1043 if(op->nrof)
1277 sub_weight(op->env, op->weight*op->nrof); 1044 sub_weight(op->env, op->weight*op->nrof);
1278 else 1045 else
1279 sub_weight(op->env, op->weight+op->carrying); 1046 sub_weight(op->env, op->weight+op->carrying);
1280 1047
1281 /* NO_FIX_PLAYER is set when a great many changes are being 1048 /* NO_FIX_PLAYER is set when a great many changes are being
1282 * made to players inventory. If set, avoiding the call 1049 * made to players inventory. If set, avoiding the call
1283 * to save cpu time. 1050 * to save cpu time.
1284 */ 1051 */
1285 if ((otmp=is_player_inv(op->env))!=NULL && otmp->contr && 1052 if ((otmp=is_player_inv(op->env))!=NULL && otmp->contr &&
1286 !QUERY_FLAG(otmp,FLAG_NO_FIX_PLAYER)) 1053 !QUERY_FLAG(otmp,FLAG_NO_FIX_PLAYER))
1287 fix_player(otmp); 1054 fix_player(otmp);
1288 1055
1289 if(op->above!=NULL) 1056 if(op->above!=NULL)
1290 op->above->below=op->below; 1057 op->above->below=op->below;
1291 else 1058 else
1292 op->env->inv=op->below; 1059 op->env->inv=op->below;
1293 1060
1294 if(op->below!=NULL) 1061 if(op->below!=NULL)
1295 op->below->above=op->above; 1062 op->below->above=op->above;
1296 1063
1297 /* we set up values so that it could be inserted into 1064 /* we set up values so that it could be inserted into
1298 * the map, but we don't actually do that - it is up 1065 * the map, but we don't actually do that - it is up
1299 * to the caller to decide what we want to do. 1066 * to the caller to decide what we want to do.
1300 */ 1067 */
1301 op->x=op->env->x,op->y=op->env->y; 1068 op->x=op->env->x,op->y=op->env->y;
1302 op->ox=op->x,op->oy=op->y;
1303 op->map=op->env->map; 1069 op->map=op->env->map;
1304 op->above=NULL,op->below=NULL; 1070 op->above=NULL,op->below=NULL;
1305 op->env=NULL; 1071 op->env=NULL;
1306 return; 1072 return;
1307 } 1073 }
1308 1074
1309 /* If we get here, we are removing it from a map */ 1075 /* If we get here, we are removing it from a map */
1310 if (op->map == NULL) return; 1076 if (op->map == NULL) return;
1311 1077
1312 x = op->x; 1078 x = op->x;
1313 y = op->y; 1079 y = op->y;
1314 m = get_map_from_coord(op->map, &x, &y); 1080 m = get_map_from_coord(op->map, &x, &y);
1315 1081
1316 if (!m) { 1082 if (!m) {
1317 LOG(llevError,"remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", 1083 LOG(llevError,"remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1318 op->map->path, op->x, op->y); 1084 op->map->path, op->x, op->y);
1319 /* in old days, we used to set x and y to 0 and continue. 1085 /* in old days, we used to set x and y to 0 and continue.
1320 * it seems if we get into this case, something is probablye 1086 * it seems if we get into this case, something is probablye
1321 * screwed up and should be fixed. 1087 * screwed up and should be fixed.
1322 */ 1088 */
1323 abort(); 1089 abort();
1324 } 1090 }
1325 if (op->map != m) { 1091 if (op->map != m) {
1326 LOG(llevDebug,"remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", 1092 LOG(llevDebug,"remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1327 op->map->path, m->path, op->x, op->y, x, y); 1093 op->map->path, m->path, op->x, op->y, x, y);
1328 } 1094 }
1329 1095
1330 /* Re did the following section of code - it looks like it had 1096 /* Re did the following section of code - it looks like it had
1331 * lots of logic for things we no longer care about 1097 * lots of logic for things we no longer care about
1332 */ 1098 */
1333 1099
1334 /* link the object above us */ 1100 /* link the object above us */
1335 if (op->above) 1101 if (op->above)
1336 op->above->below=op->below; 1102 op->above->below=op->below;
1337 else 1103 else
1338 SET_MAP_TOP(m,x,y,op->below); /* we were top, set new top */ 1104 SET_MAP_TOP(m,x,y,op->below); /* we were top, set new top */
1339 1105
1340 /* Relink the object below us, if there is one */ 1106 /* Relink the object below us, if there is one */
1341 if(op->below) { 1107 if(op->below) {
1342 op->below->above=op->above; 1108 op->below->above=op->above;
1343 } else { 1109 } else {
1344 /* Nothing below, which means we need to relink map object for this space 1110 /* Nothing below, which means we need to relink map object for this space
1345 * use translated coordinates in case some oddness with map tiling is 1111 * use translated coordinates in case some oddness with map tiling is
1346 * evident 1112 * evident
1347 */ 1113 */
1348 if(GET_MAP_OB(m,x,y)!=op) { 1114 if(GET_MAP_OB(m,x,y)!=op) {
1349 dump_object(op); 1115 dump_object(op);
1350 LOG(llevError,"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg); 1116 LOG(llevError,"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);
1351 dump_object(GET_MAP_OB(m,x,y)); 1117 dump_object(GET_MAP_OB(m,x,y));
1352 LOG(llevError,"%s\n",errmsg); 1118 LOG(llevError,"%s\n",errmsg);
1353 } 1119 }
1354 SET_MAP_OB(m,x,y,op->above); /* goes on above it. */ 1120 SET_MAP_OB(m,x,y,op->above); /* goes on above it. */
1355 } 1121 }
1356 op->above=NULL; 1122 op->above=NULL;
1357 op->below=NULL; 1123 op->below=NULL;
1358 1124
1359 if (op->map->in_memory == MAP_SAVING) 1125 if (op->map->in_memory == MAP_SAVING)
1360 return; 1126 return;
1361 1127
1362 tag = op->count; 1128 tag = op->count;
1363 check_walk_off = ! QUERY_FLAG (op, FLAG_NO_APPLY); 1129 check_walk_off = ! QUERY_FLAG (op, FLAG_NO_APPLY);
1364 for(tmp=GET_MAP_OB(m,x,y);tmp!=NULL;tmp=tmp->above) { 1130 for(tmp=GET_MAP_OB(m,x,y);tmp!=NULL;tmp=tmp->above) {
1365 /* No point updating the players look faces if he is the object 1131 /* No point updating the players look faces if he is the object
1366 * being removed. 1132 * being removed.
1367 */ 1133 */
1368 1134
1369 if(tmp->type==PLAYER && tmp!=op) { 1135 if(tmp->type==PLAYER && tmp!=op) {
1370 /* If a container that the player is currently using somehow gets 1136 /* If a container that the player is currently using somehow gets
1371 * removed (most likely destroyed), update the player view 1137 * removed (most likely destroyed), update the player view
1372 * appropriately. 1138 * appropriately.
1373 */ 1139 */
1374 if (tmp->container==op) { 1140 if (tmp->container==op) {
1375 CLEAR_FLAG(op, FLAG_APPLIED); 1141 CLEAR_FLAG(op, FLAG_APPLIED);
1376 tmp->container=NULL; 1142 tmp->container=NULL;
1377 } 1143 }
1378 tmp->contr->socket.update_look=1; 1144 tmp->contr->socket.update_look=1;
1379 } 1145 }
1380 /* See if player moving off should effect something */ 1146 /* See if player moving off should effect something */
1381 if (check_walk_off && ((op->move_type & tmp->move_off) && 1147 if (check_walk_off && ((op->move_type & tmp->move_off) &&
1382 (op->move_type & ~tmp->move_off & ~tmp->move_block)==0)) { 1148 (op->move_type & ~tmp->move_off & ~tmp->move_block)==0)) {
1383 1149
1384 move_apply(tmp, op, NULL); 1150 move_apply(tmp, op, NULL);
1385 if (was_destroyed (op, tag)) { 1151 if (was_destroyed (op, tag)) {
1386 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " 1152 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed "
1387 "leaving object\n", tmp->name, tmp->arch->name); 1153 "leaving object\n", &tmp->name, &tmp->arch->name);
1388 } 1154 }
1389 } 1155 }
1390 1156
1391 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1157 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1392 1158
1393 if(tmp->above == tmp) 1159 if(tmp->above == tmp)
1394 tmp->above = NULL; 1160 tmp->above = NULL;
1395 last=tmp; 1161 last=tmp;
1396 } 1162 }
1397 /* last == NULL of there are no objects on this space */ 1163 /* last == NULL of there are no objects on this space */
1398 if (last==NULL) { 1164 if (last==NULL) {
1399 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1165 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1400 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures 1166 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1401 * those out anyways, and if there are any flags set right now, they won't 1167 * those out anyways, and if there are any flags set right now, they won't
1402 * be correct anyways. 1168 * be correct anyways.
1403 */ 1169 */
1404 SET_MAP_FLAGS(op->map, op->x, op->y, P_NEED_UPDATE); 1170 SET_MAP_FLAGS(op->map, op->x, op->y, P_NEED_UPDATE);
1405 update_position(op->map, op->x, op->y); 1171 update_position(op->map, op->x, op->y);
1406 } 1172 }
1407 else 1173 else
1408 update_object(last, UP_OBJ_REMOVE); 1174 update_object(last, UP_OBJ_REMOVE);
1409 1175
1410 if(QUERY_FLAG(op,FLAG_BLOCKSVIEW)|| (op->glow_radius != 0)) 1176 if(QUERY_FLAG(op,FLAG_BLOCKSVIEW)|| (op->glow_radius != 0))
1411 update_all_los(op->map, op->x, op->y); 1177 update_all_los(op->map, op->x, op->y);
1412 1178
1413} 1179}
1414 1180
1415/* 1181/*
1416 * merge_ob(op,top): 1182 * merge_ob(op,top):
… …
1482{ 1248{
1483 object *tmp, *top, *floor=NULL; 1249 object *tmp, *top, *floor=NULL;
1484 sint16 x,y; 1250 sint16 x,y;
1485 1251
1486 if (QUERY_FLAG (op, FLAG_FREED)) { 1252 if (QUERY_FLAG (op, FLAG_FREED)) {
1487 LOG (llevError, "Trying to insert freed object!\n"); 1253 LOG (llevError, "Trying to insert freed object!\n");
1488 return NULL; 1254 return NULL;
1489 } 1255 }
1490 if(m==NULL) { 1256 if(m==NULL) {
1491 dump_object(op); 1257 dump_object(op);
1492 LOG(llevError,"Trying to insert in null-map!\n%s\n",errmsg); 1258 LOG(llevError,"Trying to insert in null-map!\n%s\n",errmsg);
1493 return op; 1259 return op;
1494 } 1260 }
1495 if(out_of_map(m,op->x,op->y)) { 1261 if(out_of_map(m,op->x,op->y)) {
1496 dump_object(op); 1262 dump_object(op);
1497 LOG(llevError,"Trying to insert object outside the map.\n%s\n", errmsg); 1263 LOG(llevError,"Trying to insert object outside the map.\n%s\n", errmsg);
1498#ifdef MANY_CORES 1264#ifdef MANY_CORES
1499 /* Better to catch this here, as otherwise the next use of this object 1265 /* Better to catch this here, as otherwise the next use of this object
1500 * is likely to cause a crash. Better to find out where it is getting 1266 * is likely to cause a crash. Better to find out where it is getting
1501 * improperly inserted. 1267 * improperly inserted.
1502 */ 1268 */
1503 abort(); 1269 abort();
1504#endif 1270#endif
1505 return op; 1271 return op;
1506 } 1272 }
1507 if(!QUERY_FLAG(op,FLAG_REMOVED)) { 1273 if(!QUERY_FLAG(op,FLAG_REMOVED)) {
1508 dump_object(op); 1274 dump_object(op);
1509 LOG(llevError,"Trying to insert (map) inserted object.\n%s\n", errmsg); 1275 LOG(llevError,"Trying to insert (map) inserted object.\n%s\n", errmsg);
1510 return op; 1276 return op;
1511 } 1277 }
1512 if(op->more!=NULL) { 1278 if(op->more!=NULL) {
1513 /* The part may be on a different map. */ 1279 /* The part may be on a different map. */
1514 1280
1515 object *more = op->more; 1281 object *more = op->more;
1516 1282
1517 /* We really need the caller to normalize coordinates - if 1283 /* We really need the caller to normalize coordinates - if
1518 * we set the map, that doesn't work if the location is within 1284 * we set the map, that doesn't work if the location is within
1519 * a map and this is straddling an edge. So only if coordinate 1285 * a map and this is straddling an edge. So only if coordinate
1520 * is clear wrong do we normalize it. 1286 * is clear wrong do we normalize it.
1521 */ 1287 */
1522 if (OUT_OF_REAL_MAP(more->map, more->x, more->y)) { 1288 if (OUT_OF_REAL_MAP(more->map, more->x, more->y)) {
1523 /* Debugging information so you can see the last coordinates this object had */
1524 more->ox = more->x;
1525 more->oy = more->y;
1526 more->map = get_map_from_coord(m, &more->x, &more->y); 1289 more->map = get_map_from_coord(m, &more->x, &more->y);
1527 } else if (!more->map) { 1290 } else if (!more->map) {
1528 /* For backwards compatibility - when not dealing with tiled maps, 1291 /* For backwards compatibility - when not dealing with tiled maps,
1529 * more->map should always point to the parent. 1292 * more->map should always point to the parent.
1530 */ 1293 */
1531 more->map = m; 1294 more->map = m;
1532 } 1295 }
1533 1296
1534 if (insert_ob_in_map(more, more->map, originator, flag) == NULL) { 1297 if (insert_ob_in_map(more, more->map, originator, flag) == NULL) {
1535 if ( ! op->head) 1298 if ( ! op->head)
1536 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1299 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1537 return NULL; 1300 return NULL;
1538 } 1301 }
1539 } 1302 }
1540 CLEAR_FLAG(op,FLAG_REMOVED); 1303 CLEAR_FLAG(op,FLAG_REMOVED);
1541
1542 /* Debugging information so you can see the last coordinates this object had */
1543 op->ox=op->x;
1544 op->oy=op->y;
1545 1304
1546 /* Ideally, the caller figures this out. However, it complicates a lot 1305 /* Ideally, the caller figures this out. However, it complicates a lot
1547 * of areas of callers (eg, anything that uses find_free_spot would now 1306 * of areas of callers (eg, anything that uses find_free_spot would now
1548 * need extra work 1307 * need extra work
1549 */ 1308 */
… …
1552 y = op->y; 1311 y = op->y;
1553 1312
1554 /* this has to be done after we translate the coordinates. 1313 /* this has to be done after we translate the coordinates.
1555 */ 1314 */
1556 if(op->nrof && !(flag & INS_NO_MERGE)) { 1315 if(op->nrof && !(flag & INS_NO_MERGE)) {
1557 for(tmp=GET_MAP_OB(op->map,x,y);tmp!=NULL;tmp=tmp->above) 1316 for(tmp=GET_MAP_OB(op->map,x,y);tmp!=NULL;tmp=tmp->above)
1558 if (CAN_MERGE(op,tmp)) { 1317 if (CAN_MERGE(op,tmp)) {
1559 op->nrof+=tmp->nrof; 1318 op->nrof+=tmp->nrof;
1560 remove_ob(tmp); 1319 remove_ob(tmp);
1561 free_object(tmp); 1320 free_object(tmp);
1562 } 1321 }
1563 } 1322 }
1564 1323
1565 CLEAR_FLAG(op,FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1324 CLEAR_FLAG(op,FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1566 CLEAR_FLAG(op, FLAG_INV_LOCKED); 1325 CLEAR_FLAG(op, FLAG_INV_LOCKED);
1567 if (!QUERY_FLAG(op, FLAG_ALIVE)) 1326 if (!QUERY_FLAG(op, FLAG_ALIVE))
1568 CLEAR_FLAG(op, FLAG_NO_STEAL); 1327 CLEAR_FLAG(op, FLAG_NO_STEAL);
1569 1328
1570 if (flag & INS_BELOW_ORIGINATOR) { 1329 if (flag & INS_BELOW_ORIGINATOR) {
1571 if (originator->map != op->map || originator->x != op->x || 1330 if (originator->map != op->map || originator->x != op->x ||
1572 originator->y != op->y) { 1331 originator->y != op->y) {
1573 LOG(llevError,"insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1332 LOG(llevError,"insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1574 abort(); 1333 abort();
1575 } 1334 }
1576 op->above = originator; 1335 op->above = originator;
1577 op->below = originator->below; 1336 op->below = originator->below;
1578 if (op->below) op->below->above = op; 1337 if (op->below) op->below->above = op;
1579 else SET_MAP_OB(op->map, op->x, op->y, op); 1338 else SET_MAP_OB(op->map, op->x, op->y, op);
1580 /* since *below* originator, no need to update top */ 1339 /* since *below* originator, no need to update top */
1581 originator->below = op; 1340 originator->below = op;
1582 } else { 1341 } else {
1583 /* If there are other objects, then */ 1342 /* If there are other objects, then */
1584 if((! (flag & INS_MAP_LOAD)) && ((top=GET_MAP_OB(op->map,op->x,op->y))!=NULL)) { 1343 if((! (flag & INS_MAP_LOAD)) && ((top=GET_MAP_OB(op->map,op->x,op->y))!=NULL)) {
1585 object *last=NULL; 1344 object *last=NULL;
1586 /* 1345 /*
1587 * If there are multiple objects on this space, we do some trickier handling. 1346 * If there are multiple objects on this space, we do some trickier handling.
1588 * We've already dealt with merging if appropriate. 1347 * We've already dealt with merging if appropriate.
1589 * Generally, we want to put the new object on top. But if 1348 * Generally, we want to put the new object on top. But if
1590 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last 1349 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1591 * floor, we want to insert above that and no further. 1350 * floor, we want to insert above that and no further.
1592 * Also, if there are spell objects on this space, we stop processing 1351 * Also, if there are spell objects on this space, we stop processing
1593 * once we get to them. This reduces the need to traverse over all of 1352 * once we get to them. This reduces the need to traverse over all of
1594 * them when adding another one - this saves quite a bit of cpu time 1353 * them when adding another one - this saves quite a bit of cpu time
1595 * when lots of spells are cast in one area. Currently, it is presumed 1354 * when lots of spells are cast in one area. Currently, it is presumed
1596 * that flying non pickable objects are spell objects. 1355 * that flying non pickable objects are spell objects.
1597 */ 1356 */
1598 1357
1599 while (top != NULL) { 1358 while (top != NULL) {
1600 if (QUERY_FLAG(top, FLAG_IS_FLOOR) || 1359 if (QUERY_FLAG(top, FLAG_IS_FLOOR) ||
1601 QUERY_FLAG(top, FLAG_OVERLAY_FLOOR)) floor = top; 1360 QUERY_FLAG(top, FLAG_OVERLAY_FLOOR)) floor = top;
1602 if (QUERY_FLAG(top, FLAG_NO_PICK) 1361 if (QUERY_FLAG(top, FLAG_NO_PICK)
1603 && (top->move_type & (MOVE_FLY_LOW |MOVE_FLY_HIGH)) 1362 && (top->move_type & (MOVE_FLY_LOW |MOVE_FLY_HIGH))
1604 && !QUERY_FLAG(top, FLAG_IS_FLOOR)) 1363 && !QUERY_FLAG(top, FLAG_IS_FLOOR))
1605 { 1364 {
1606 /* We insert above top, so we want this object below this */ 1365 /* We insert above top, so we want this object below this */
1607 top=top->below; 1366 top=top->below;
1608 break; 1367 break;
1609 } 1368 }
1610 last = top; 1369 last = top;
1611 top = top->above; 1370 top = top->above;
1612 } 1371 }
1613 /* Don't want top to be NULL, so set it to the last valid object */ 1372 /* Don't want top to be NULL, so set it to the last valid object */
1614 top = last; 1373 top = last;
1615 1374
1616 /* We let update_position deal with figuring out what the space 1375 /* We let update_position deal with figuring out what the space
1617 * looks like instead of lots of conditions here. 1376 * looks like instead of lots of conditions here.
1618 * makes things faster, and effectively the same result. 1377 * makes things faster, and effectively the same result.
1619 */ 1378 */
1620 1379
1621 /* Have object 'fall below' other objects that block view. 1380 /* Have object 'fall below' other objects that block view.
1622 * Unless those objects are exits, type 66 1381 * Unless those objects are exits, type 66
1623 * If INS_ON_TOP is used, don't do this processing 1382 * If INS_ON_TOP is used, don't do this processing
1624 * Need to find the object that in fact blocks view, otherwise 1383 * Need to find the object that in fact blocks view, otherwise
1625 * stacking is a bit odd. 1384 * stacking is a bit odd.
1626 */ 1385 */
1627 if (!(flag & INS_ON_TOP) && 1386 if (!(flag & INS_ON_TOP) &&
1628 (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && 1387 (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) &&
1629 (op->face && !op->face->visibility)) { 1388 (op->face && !op->face->visibility)) {
1630 for (last=top; last != floor; last=last->below) 1389 for (last=top; last != floor; last=last->below)
1631 if (QUERY_FLAG(last, FLAG_BLOCKSVIEW)&&(last->type != EXIT)) break; 1390 if (QUERY_FLAG(last, FLAG_BLOCKSVIEW)&&(last->type != EXIT)) break;
1632 /* Check to see if we found the object that blocks view, 1391 /* Check to see if we found the object that blocks view,
1633 * and make sure we have a below pointer for it so that 1392 * and make sure we have a below pointer for it so that
1634 * we can get inserted below this one, which requires we 1393 * we can get inserted below this one, which requires we
1635 * set top to the object below us. 1394 * set top to the object below us.
1636 */ 1395 */
1637 if (last && last->below && last != floor) top=last->below; 1396 if (last && last->below && last != floor) top=last->below;
1638 } 1397 }
1639 } /* If objects on this space */ 1398 } /* If objects on this space */
1640 if (flag & INS_MAP_LOAD) 1399 if (flag & INS_MAP_LOAD)
1641 top = GET_MAP_TOP(op->map,op->x,op->y); 1400 top = GET_MAP_TOP(op->map,op->x,op->y);
1642 if (flag & INS_ABOVE_FLOOR_ONLY) top = floor; 1401 if (flag & INS_ABOVE_FLOOR_ONLY) top = floor;
1643 1402
1644 /* Top is the object that our object (op) is going to get inserted above. 1403 /* Top is the object that our object (op) is going to get inserted above.
1645 */ 1404 */
1646 1405
1647 /* First object on this space */ 1406 /* First object on this space */
1648 if (!top) { 1407 if (!top) {
1649 op->above = GET_MAP_OB(op->map, op->x, op->y); 1408 op->above = GET_MAP_OB(op->map, op->x, op->y);
1650 if (op->above) op->above->below = op; 1409 if (op->above) op->above->below = op;
1651 op->below = NULL; 1410 op->below = NULL;
1652 SET_MAP_OB(op->map, op->x, op->y, op); 1411 SET_MAP_OB(op->map, op->x, op->y, op);
1653 } else { /* get inserted into the stack above top */ 1412 } else { /* get inserted into the stack above top */
1654 op->above = top->above; 1413 op->above = top->above;
1655 if (op->above) op->above->below = op; 1414 if (op->above) op->above->below = op;
1656 op->below = top; 1415 op->below = top;
1657 top->above = op; 1416 top->above = op;
1658 } 1417 }
1659 if (op->above==NULL) 1418 if (op->above==NULL)
1660 SET_MAP_TOP(op->map,op->x, op->y, op); 1419 SET_MAP_TOP(op->map,op->x, op->y, op);
1661 } /* else not INS_BELOW_ORIGINATOR */ 1420 } /* else not INS_BELOW_ORIGINATOR */
1662 1421
1663 if(op->type==PLAYER) 1422 if(op->type==PLAYER)
1664 op->contr->do_los=1; 1423 op->contr->do_los=1;
1665 1424
1666 /* If we have a floor, we know the player, if any, will be above 1425 /* If we have a floor, we know the player, if any, will be above
1667 * it, so save a few ticks and start from there. 1426 * it, so save a few ticks and start from there.
1668 */ 1427 */
1669 if (!(flag & INS_MAP_LOAD)) 1428 if (!(flag & INS_MAP_LOAD))
1670 for(tmp=floor?floor:GET_MAP_OB(op->map,op->x,op->y);tmp!=NULL;tmp=tmp->above) { 1429 for(tmp=floor?floor:GET_MAP_OB(op->map,op->x,op->y);tmp!=NULL;tmp=tmp->above) {
1671 if (tmp->type == PLAYER) 1430 if (tmp->type == PLAYER)
1672 tmp->contr->socket.update_look=1; 1431 tmp->contr->socket.update_look=1;
1673 } 1432 }
1674 1433
1675 /* If this object glows, it may affect lighting conditions that are 1434 /* If this object glows, it may affect lighting conditions that are
1676 * visible to others on this map. But update_all_los is really 1435 * visible to others on this map. But update_all_los is really
1677 * an inefficient way to do this, as it means los for all players 1436 * an inefficient way to do this, as it means los for all players
1678 * on the map will get recalculated. The players could very well 1437 * on the map will get recalculated. The players could very well
… …
1680 * this should get redone to only look for players within range, 1439 * this should get redone to only look for players within range,
1681 * or just updating the P_NEED_UPDATE for spaces within this area 1440 * or just updating the P_NEED_UPDATE for spaces within this area
1682 * of effect may be sufficient. 1441 * of effect may be sufficient.
1683 */ 1442 */
1684 if(MAP_DARKNESS(op->map) && (op->glow_radius != 0)) 1443 if(MAP_DARKNESS(op->map) && (op->glow_radius != 0))
1685 update_all_los(op->map, op->x, op->y); 1444 update_all_los(op->map, op->x, op->y);
1686 1445
1687 1446
1688 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1447 /* updates flags (blocked, alive, no magic, etc) for this map space */
1689 update_object(op,UP_OBJ_INSERT); 1448 update_object(op,UP_OBJ_INSERT);
1690 1449
… …
1700 1459
1701 /* if this is not the head or flag has been passed, don't check walk on status */ 1460 /* if this is not the head or flag has been passed, don't check walk on status */
1702 1461
1703 if (!(flag & INS_NO_WALK_ON) && !op->head) { 1462 if (!(flag & INS_NO_WALK_ON) && !op->head) {
1704 if (check_move_on(op, originator)) 1463 if (check_move_on(op, originator))
1705 return NULL; 1464 return NULL;
1706 1465
1707 /* If we are a multi part object, lets work our way through the check 1466 /* If we are a multi part object, lets work our way through the check
1708 * walk on's. 1467 * walk on's.
1709 */ 1468 */
1710 for (tmp=op->more; tmp!=NULL; tmp=tmp->more) 1469 for (tmp=op->more; tmp!=NULL; tmp=tmp->more)
1711 if (check_move_on (tmp, originator)) 1470 if (check_move_on (tmp, originator))
1712 return NULL; 1471 return NULL;
1713 } 1472 }
1714 return op; 1473 return op;
1715} 1474}
1716 1475
1717/* this function inserts an object in the map, but if it 1476/* this function inserts an object in the map, but if it
… …
1723 object *tmp1; 1482 object *tmp1;
1724 1483
1725 /* first search for itself and remove any old instances */ 1484 /* first search for itself and remove any old instances */
1726 1485
1727 for(tmp=GET_MAP_OB(op->map,op->x,op->y); tmp!=NULL; tmp=tmp->above) { 1486 for(tmp=GET_MAP_OB(op->map,op->x,op->y); tmp!=NULL; tmp=tmp->above) {
1728 if(!strcmp(tmp->arch->name,arch_string)) /* same archetype */ { 1487 if(!strcmp(tmp->arch->name,arch_string)) /* same archetype */ {
1729 remove_ob(tmp); 1488 remove_ob(tmp);
1730 free_object(tmp); 1489 free_object(tmp);
1731 } 1490 }
1732 } 1491 }
1733 1492
1734 tmp1=arch_to_object(find_archetype(arch_string)); 1493 tmp1=arch_to_object(find_archetype(arch_string));
1735 1494
1736 1495
… …
1749object *get_split_ob(object *orig_ob, uint32 nr) { 1508object *get_split_ob(object *orig_ob, uint32 nr) {
1750 object *newob; 1509 object *newob;
1751 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1510 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1752 1511
1753 if(orig_ob->nrof<nr) { 1512 if(orig_ob->nrof<nr) {
1754 sprintf(errmsg,"There are only %d %ss.", 1513 sprintf(errmsg,"There are only %d %ss.",
1755 orig_ob->nrof?orig_ob->nrof:1, orig_ob->name); 1514 orig_ob->nrof?orig_ob->nrof:1, &orig_ob->name);
1756 return NULL; 1515 return NULL;
1757 } 1516 }
1758 newob = object_create_clone(orig_ob); 1517 newob = object_create_clone(orig_ob);
1759 if((orig_ob->nrof-=nr)<1) { 1518 if((orig_ob->nrof-=nr)<1) {
1760 if ( ! is_removed) 1519 if ( ! is_removed)
1761 remove_ob(orig_ob); 1520 remove_ob(orig_ob);
1762 free_object2(orig_ob, 1); 1521 free_object2(orig_ob, 1);
1763 } 1522 }
1764 else if ( ! is_removed) { 1523 else if ( ! is_removed) {
1765 if(orig_ob->env!=NULL) 1524 if(orig_ob->env!=NULL)
1766 sub_weight (orig_ob->env,orig_ob->weight*nr); 1525 sub_weight (orig_ob->env,orig_ob->weight*nr);
1767 if (orig_ob->env == NULL && orig_ob->map->in_memory!=MAP_IN_MEMORY) { 1526 if (orig_ob->env == NULL && orig_ob->map->in_memory!=MAP_IN_MEMORY) {
1768 strcpy(errmsg, "Tried to split object whose map is not in memory."); 1527 strcpy(errmsg, "Tried to split object whose map is not in memory.");
1769 LOG(llevDebug, 1528 LOG(llevDebug,
1770 "Error, Tried to split object whose map is not in memory.\n"); 1529 "Error, Tried to split object whose map is not in memory.\n");
1771 return NULL; 1530 return NULL;
1772 } 1531 }
1773 } 1532 }
1774 newob->nrof=nr; 1533 newob->nrof=nr;
1775 1534
1776 return newob; 1535 return newob;
1777} 1536}
… …
1799 { 1558 {
1800 op->nrof -= i; 1559 op->nrof -= i;
1801 } 1560 }
1802 else if (op->env != NULL) 1561 else if (op->env != NULL)
1803 { 1562 {
1804 /* is this object in the players inventory, or sub container 1563 /* is this object in the players inventory, or sub container
1805 * therein? 1564 * therein?
1806 */ 1565 */
1807 tmp = is_player_inv (op->env); 1566 tmp = is_player_inv (op->env);
1808 /* nope. Is this a container the player has opened? 1567 /* nope. Is this a container the player has opened?
1809 * If so, set tmp to that player. 1568 * If so, set tmp to that player.
1810 * IMO, searching through all the players will mostly 1569 * IMO, searching through all the players will mostly
1811 * likely be quicker than following op->env to the map, 1570 * likely be quicker than following op->env to the map,
1812 * and then searching the map for a player. 1571 * and then searching the map for a player.
1813 */ 1572 */
1814 if (!tmp) { 1573 if (!tmp) {
1815 for (pl=first_player; pl; pl=pl->next) 1574 for (pl=first_player; pl; pl=pl->next)
1816 if (pl->ob->container == op->env) break; 1575 if (pl->ob->container == op->env) break;
1817 if (pl) tmp=pl->ob; 1576 if (pl) tmp=pl->ob;
1818 else tmp=NULL; 1577 else tmp=NULL;
1819 } 1578 }
1820 1579
1821 if (i < op->nrof) { 1580 if (i < op->nrof) {
1822 sub_weight (op->env, op->weight * i); 1581 sub_weight (op->env, op->weight * i);
1823 op->nrof -= i; 1582 op->nrof -= i;
1824 if (tmp) { 1583 if (tmp) {
… …
1832 } 1591 }
1833 } 1592 }
1834 } 1593 }
1835 else 1594 else
1836 { 1595 {
1837 object *above = op->above; 1596 object *above = op->above;
1838 1597
1839 if (i < op->nrof) { 1598 if (i < op->nrof) {
1840 op->nrof -= i; 1599 op->nrof -= i;
1841 } else { 1600 } else {
1842 remove_ob (op); 1601 remove_ob (op);
1843 op->nrof = 0; 1602 op->nrof = 0;
1844 } 1603 }
1845 /* Since we just removed op, op->above is null */ 1604 /* Since we just removed op, op->above is null */
1846 for (tmp = above; tmp != NULL; tmp = tmp->above) 1605 for (tmp = above; tmp != NULL; tmp = tmp->above)
1847 if (tmp->type == PLAYER) { 1606 if (tmp->type == PLAYER) {
1848 if (op->nrof) 1607 if (op->nrof)
1849 esrv_send_item(tmp, op); 1608 esrv_send_item(tmp, op);
1850 else 1609 else
… …
1902 LOG(llevError,"Trying to put object in NULL.\n%s\n", errmsg); 1661 LOG(llevError,"Trying to put object in NULL.\n%s\n", errmsg);
1903 return op; 1662 return op;
1904 } 1663 }
1905 if (where->head) { 1664 if (where->head) {
1906 LOG(llevDebug, 1665 LOG(llevDebug,
1907 "Warning: Tried to insert object wrong part of multipart object.\n"); 1666 "Warning: Tried to insert object wrong part of multipart object.\n");
1908 where = where->head; 1667 where = where->head;
1909 } 1668 }
1910 if (op->more) { 1669 if (op->more) {
1911 LOG(llevError, "Tried to insert multipart object %s (%d)\n", 1670 LOG(llevError, "Tried to insert multipart object %s (%d)\n",
1912 op->name, op->count); 1671 &op->name, op->count);
1913 return op; 1672 return op;
1914 } 1673 }
1915 CLEAR_FLAG(op, FLAG_OBJ_ORIGINAL); 1674 CLEAR_FLAG(op, FLAG_OBJ_ORIGINAL);
1916 CLEAR_FLAG(op, FLAG_REMOVED); 1675 CLEAR_FLAG(op, FLAG_REMOVED);
1917 if(op->nrof) { 1676 if(op->nrof) {
1918 for(tmp=where->inv;tmp!=NULL;tmp=tmp->below) 1677 for(tmp=where->inv;tmp!=NULL;tmp=tmp->below)
1919 if ( CAN_MERGE(tmp,op) ) { 1678 if ( CAN_MERGE(tmp,op) ) {
1920 /* return the original object and remove inserted object 1679 /* return the original object and remove inserted object
1921 (client needs the original object) */ 1680 (client needs the original object) */
1922 tmp->nrof += op->nrof; 1681 tmp->nrof += op->nrof;
1923 /* Weight handling gets pretty funky. Since we are adding to 1682 /* Weight handling gets pretty funky. Since we are adding to
1924 * tmp->nrof, we need to increase the weight. 1683 * tmp->nrof, we need to increase the weight.
1925 */ 1684 */
1926 add_weight (where, op->weight*op->nrof); 1685 add_weight (where, op->weight*op->nrof);
1927 SET_FLAG(op, FLAG_REMOVED); 1686 SET_FLAG(op, FLAG_REMOVED);
1928 free_object(op); /* free the inserted object */ 1687 free_object(op); /* free the inserted object */
1929 op = tmp; 1688 op = tmp;
1930 remove_ob (op); /* and fix old object's links */ 1689 remove_ob (op); /* and fix old object's links */
1931 CLEAR_FLAG(op, FLAG_REMOVED); 1690 CLEAR_FLAG(op, FLAG_REMOVED);
1932 break; 1691 break;
1933 } 1692 }
1934 1693
1935 /* I assume combined objects have no inventory 1694 /* I assume combined objects have no inventory
1936 * We add the weight - this object could have just been removed 1695 * We add the weight - this object could have just been removed
1937 * (if it was possible to merge). calling remove_ob will subtract 1696 * (if it was possible to merge). calling remove_ob will subtract
… …
1951 op->map=NULL; 1710 op->map=NULL;
1952 op->env=where; 1711 op->env=where;
1953 op->above=NULL; 1712 op->above=NULL;
1954 op->below=NULL; 1713 op->below=NULL;
1955 op->x=0,op->y=0; 1714 op->x=0,op->y=0;
1956 op->ox=0,op->oy=0;
1957 1715
1958 /* reset the light list and los of the players on the map */ 1716 /* reset the light list and los of the players on the map */
1959 if((op->glow_radius!=0)&&where->map) 1717 if((op->glow_radius!=0)&&where->map)
1960 { 1718 {
1961#ifdef DEBUG_LIGHTS 1719#ifdef DEBUG_LIGHTS
1962 LOG(llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", 1720 LOG(llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n",
1963 op->name); 1721 op->name);
1964#endif /* DEBUG_LIGHTS */ 1722#endif /* DEBUG_LIGHTS */
1965 if (MAP_DARKNESS(where->map)) update_all_los(where->map, where->x, where->y); 1723 if (MAP_DARKNESS(where->map)) update_all_los(where->map, where->x, where->y);
1966 } 1724 }
1967 1725
1968 /* Client has no idea of ordering so lets not bother ordering it here. 1726 /* Client has no idea of ordering so lets not bother ordering it here.
… …
2003{ 1761{
2004 object *tmp; 1762 object *tmp;
2005 tag_t tag; 1763 tag_t tag;
2006 mapstruct *m=op->map; 1764 mapstruct *m=op->map;
2007 int x=op->x, y=op->y; 1765 int x=op->x, y=op->y;
2008 MoveType move_on, move_slow, move_block; 1766 MoveType move_on, move_slow, move_block;
2009 1767
2010 if(QUERY_FLAG(op,FLAG_NO_APPLY)) 1768 if(QUERY_FLAG(op,FLAG_NO_APPLY))
2011 return 0; 1769 return 0;
2012 1770
2013 tag = op->count; 1771 tag = op->count;
2014 1772
2015 move_on = GET_MAP_MOVE_ON(op->map, op->x, op->y); 1773 move_on = GET_MAP_MOVE_ON(op->map, op->x, op->y);
2016 move_slow = GET_MAP_MOVE_SLOW(op->map, op->x, op->y); 1774 move_slow = GET_MAP_MOVE_SLOW(op->map, op->x, op->y);
… …
2020 * no need to do checking below. have to make sure move_type 1778 * no need to do checking below. have to make sure move_type
2021 * is set, as lots of objects don't have it set - we treat that 1779 * is set, as lots of objects don't have it set - we treat that
2022 * as walking. 1780 * as walking.
2023 */ 1781 */
2024 if (op->move_type && !(op->move_type & move_on) && !(op->move_type & move_slow)) 1782 if (op->move_type && !(op->move_type & move_on) && !(op->move_type & move_slow))
2025 return 0; 1783 return 0;
2026 1784
2027 /* This is basically inverse logic of that below - basically, 1785 /* This is basically inverse logic of that below - basically,
2028 * if the object can avoid the move on or slow move, they do so, 1786 * if the object can avoid the move on or slow move, they do so,
2029 * but can't do it if the alternate movement they are using is 1787 * but can't do it if the alternate movement they are using is
2030 * blocked. Logic on this seems confusing, but does seem correct. 1788 * blocked. Logic on this seems confusing, but does seem correct.
2031 */ 1789 */
2032 if ((op->move_type & ~move_on & ~move_block) != 0 && 1790 if ((op->move_type & ~move_on & ~move_block) != 0 &&
2033 (op->move_type & ~move_slow & ~move_block) != 0) return 0; 1791 (op->move_type & ~move_slow & ~move_block) != 0) return 0;
2034 1792
2035 /* The objects have to be checked from top to bottom. 1793 /* The objects have to be checked from top to bottom.
2036 * Hence, we first go to the top: 1794 * Hence, we first go to the top:
2037 */ 1795 */
2038 1796
2039 for (tmp=GET_MAP_OB(op->map, op->x, op->y); tmp!=NULL && 1797 for (tmp=GET_MAP_OB(op->map, op->x, op->y); tmp!=NULL &&
2040 tmp->above!=NULL; tmp=tmp->above) { 1798 tmp->above!=NULL; tmp=tmp->above) {
2041 /* Trim the search when we find the first other spell effect 1799 /* Trim the search when we find the first other spell effect
2042 * this helps performance so that if a space has 50 spell objects, 1800 * this helps performance so that if a space has 50 spell objects,
2043 * we don't need to check all of them. 1801 * we don't need to check all of them.
2044 */ 1802 */
2045 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG(tmp, FLAG_NO_PICK)) break; 1803 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG(tmp, FLAG_NO_PICK)) break;
2046 } 1804 }
2047 for(;tmp!=NULL; tmp=tmp->below) { 1805 for(;tmp!=NULL; tmp=tmp->below) {
2048 if (tmp == op) continue; /* Can't apply yourself */ 1806 if (tmp == op) continue; /* Can't apply yourself */
2049 1807
2050 /* Check to see if one of the movement types should be slowed down. 1808 /* Check to see if one of the movement types should be slowed down.
2051 * Second check makes sure that the movement types not being slowed 1809 * Second check makes sure that the movement types not being slowed
2052 * (~slow_move) is not blocked on this space - just because the 1810 * (~slow_move) is not blocked on this space - just because the
2053 * space doesn't slow down swimming (for example), if you can't actually 1811 * space doesn't slow down swimming (for example), if you can't actually
2054 * swim on that space, can't use it to avoid the penalty. 1812 * swim on that space, can't use it to avoid the penalty.
2055 */ 1813 */
2056 if (!QUERY_FLAG(op, FLAG_WIZPASS)) { 1814 if (!QUERY_FLAG(op, FLAG_WIZPASS)) {
2057 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1815 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2058 ((op->move_type & tmp->move_slow) && 1816 ((op->move_type & tmp->move_slow) &&
2059 (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) { 1817 (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) {
2060 1818
2061 float diff; 1819 float diff;
2062 1820
2063 diff = tmp->move_slow_penalty*FABS(op->speed); 1821 diff = tmp->move_slow_penalty*FABS(op->speed);
2064 if (op->type == PLAYER) { 1822 if (op->type == PLAYER) {
2065 if ((QUERY_FLAG(tmp, FLAG_IS_HILLY) && find_skill_by_number(op, SK_CLIMBING)) || 1823 if ((QUERY_FLAG(tmp, FLAG_IS_HILLY) && find_skill_by_number(op, SK_CLIMBING)) ||
2066 (QUERY_FLAG(tmp, FLAG_IS_WOODED) && find_skill_by_number(op, SK_WOODSMAN))) { 1824 (QUERY_FLAG(tmp, FLAG_IS_WOODED) && find_skill_by_number(op, SK_WOODSMAN))) {
2067 diff /= 4.0; 1825 diff /= 4.0;
2068 } 1826 }
2069 } 1827 }
2070 op->speed_left -= diff; 1828 op->speed_left -= diff;
2071 } 1829 }
2072 } 1830 }
2073 1831
2074 /* Basically same logic as above, except now for actual apply. */ 1832 /* Basically same logic as above, except now for actual apply. */
2075 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1833 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2076 ((op->move_type & tmp->move_on) && 1834 ((op->move_type & tmp->move_on) &&
2077 (op->move_type & ~tmp->move_on & ~tmp->move_block)==0)) { 1835 (op->move_type & ~tmp->move_on & ~tmp->move_block)==0)) {
2078 1836
2079 move_apply(tmp, op, originator); 1837 move_apply(tmp, op, originator);
2080 if (was_destroyed (op, tag)) 1838 if (was_destroyed (op, tag))
2081 return 1; 1839 return 1;
2082 1840
2083 /* what the person/creature stepped onto has moved the object 1841 /* what the person/creature stepped onto has moved the object
2084 * someplace new. Don't process any further - if we did, 1842 * someplace new. Don't process any further - if we did,
2085 * have a feeling strange problems would result. 1843 * have a feeling strange problems would result.
2086 */ 1844 */
2087 if (op->map != m || op->x != x || op->y != y) return 0; 1845 if (op->map != m || op->x != x || op->y != y) return 0;
2088 } 1846 }
2089 } 1847 }
2090 return 0; 1848 return 0;
2091} 1849}
2092 1850
2093/* 1851/*
… …
2157 1915
2158object *present_in_ob_by_name(int type, const char *str, const object *op) { 1916object *present_in_ob_by_name(int type, const char *str, const object *op) {
2159 object *tmp; 1917 object *tmp;
2160 1918
2161 for(tmp=op->inv; tmp!=NULL; tmp=tmp->below) { 1919 for(tmp=op->inv; tmp!=NULL; tmp=tmp->below) {
2162 if ((type==-1 || tmp->type==type) && (!strcmp(str, tmp->name))) 1920 if ((type==-1 || tmp->type==type) && (!strcmp(str, tmp->name)))
2163 return tmp; 1921 return tmp;
2164 } 1922 }
2165 return NULL; 1923 return NULL;
2166} 1924}
2167 1925
2168/* 1926/*
… …
2238int find_free_spot(const object *ob, mapstruct *m,int x,int y,int start,int stop) { 1996int find_free_spot(const object *ob, mapstruct *m,int x,int y,int start,int stop) {
2239 int i,index=0, flag; 1997 int i,index=0, flag;
2240 static int altern[SIZEOFFREE]; 1998 static int altern[SIZEOFFREE];
2241 1999
2242 for(i=start;i<stop;i++) { 2000 for(i=start;i<stop;i++) {
2243 flag = ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i]); 2001 flag = ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i]);
2244 if(!flag) 2002 if(!flag)
2245 altern[index++]=i; 2003 altern[index++]=i;
2246 2004
2247 /* Basically, if we find a wall on a space, we cut down the search size. 2005 /* Basically, if we find a wall on a space, we cut down the search size.
2248 * In this way, we won't return spaces that are on another side of a wall. 2006 * In this way, we won't return spaces that are on another side of a wall.
2249 * This mostly work, but it cuts down the search size in all directions - 2007 * This mostly work, but it cuts down the search size in all directions -
2250 * if the space being examined only has a wall to the north and empty 2008 * if the space being examined only has a wall to the north and empty
2251 * spaces in all the other directions, this will reduce the search space 2009 * spaces in all the other directions, this will reduce the search space
2252 * to only the spaces immediately surrounding the target area, and 2010 * to only the spaces immediately surrounding the target area, and
2253 * won't look 2 spaces south of the target space. 2011 * won't look 2 spaces south of the target space.
2254 */ 2012 */
2255 else if ((flag & AB_NO_PASS) && maxfree[i]<stop) 2013 else if ((flag & AB_NO_PASS) && maxfree[i]<stop)
2256 stop=maxfree[i]; 2014 stop=maxfree[i];
2257 } 2015 }
2258 if(!index) return -1; 2016 if(!index) return -1;
2259 return altern[RANDOM()%index]; 2017 return altern[RANDOM()%index];
2260} 2018}
2261 2019
… …
2267 */ 2025 */
2268 2026
2269int find_first_free_spot(const object *ob, mapstruct *m,int x,int y) { 2027int find_first_free_spot(const object *ob, mapstruct *m,int x,int y) {
2270 int i; 2028 int i;
2271 for(i=0;i<SIZEOFFREE;i++) { 2029 for(i=0;i<SIZEOFFREE;i++) {
2272 if(!ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i])) 2030 if(!ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i]))
2273 return i; 2031 return i;
2274 } 2032 }
2275 return -1; 2033 return -1;
2276} 2034}
2277 2035
2278/* 2036/*
… …
2284 int i, j, tmp, len; 2042 int i, j, tmp, len;
2285 2043
2286 len = end-begin; 2044 len = end-begin;
2287 for(i = begin; i < end; i++) 2045 for(i = begin; i < end; i++)
2288 { 2046 {
2289 j = begin+RANDOM()%len; 2047 j = begin+RANDOM()%len;
2290 2048
2291 tmp = arr[i]; 2049 tmp = arr[i];
2292 arr[i] = arr[j]; 2050 arr[i] = arr[j];
2293 arr[j] = tmp; 2051 arr[j] = tmp;
2294 } 2052 }
2295} 2053}
2296 2054
2297/* new function to make monster searching more efficient, and effective! 2055/* new function to make monster searching more efficient, and effective!
2298 * This basically returns a randomized array (in the passed pointer) of 2056 * This basically returns a randomized array (in the passed pointer) of
… …
2305{ 2063{
2306 int i; 2064 int i;
2307 2065
2308 for(i = 0; i < SIZEOFFREE; i++) 2066 for(i = 0; i < SIZEOFFREE; i++)
2309 { 2067 {
2310 search_arr[i] = i; 2068 search_arr[i] = i;
2311 } 2069 }
2312 2070
2313 permute(search_arr, 1, SIZEOFFREE1+1); 2071 permute(search_arr, 1, SIZEOFFREE1+1);
2314 permute(search_arr, SIZEOFFREE1+1, SIZEOFFREE2+1); 2072 permute(search_arr, SIZEOFFREE1+1, SIZEOFFREE2+1);
2315 permute(search_arr, SIZEOFFREE2+1, SIZEOFFREE); 2073 permute(search_arr, SIZEOFFREE2+1, SIZEOFFREE);
… …
2331int find_dir(mapstruct *m, int x, int y, object *exclude) { 2089int find_dir(mapstruct *m, int x, int y, object *exclude) {
2332 int i,max=SIZEOFFREE, mflags; 2090 int i,max=SIZEOFFREE, mflags;
2333 sint16 nx, ny; 2091 sint16 nx, ny;
2334 object *tmp; 2092 object *tmp;
2335 mapstruct *mp; 2093 mapstruct *mp;
2336 MoveType blocked, move_type; 2094 MoveType blocked, move_type;
2337 2095
2338 if (exclude && exclude->head) { 2096 if (exclude && exclude->head) {
2339 exclude = exclude->head; 2097 exclude = exclude->head;
2340 move_type = exclude->move_type; 2098 move_type = exclude->move_type;
2341 } else { 2099 } else {
2342 /* If we don't have anything, presume it can use all movement types. */ 2100 /* If we don't have anything, presume it can use all movement types. */
2343 move_type=MOVE_ALL; 2101 move_type=MOVE_ALL;
2344 } 2102 }
2345 2103
2346 for(i=1;i<max;i++) { 2104 for(i=1;i<max;i++) {
2347 mp = m; 2105 mp = m;
2348 nx = x + freearr_x[i]; 2106 nx = x + freearr_x[i];
2349 ny = y + freearr_y[i]; 2107 ny = y + freearr_y[i];
2350 2108
2351 mflags = get_map_flags(m, &mp, nx, ny, &nx, &ny); 2109 mflags = get_map_flags(m, &mp, nx, ny, &nx, &ny);
2352 if (mflags & P_OUT_OF_MAP) { 2110 if (mflags & P_OUT_OF_MAP) {
2353 max = maxfree[i]; 2111 max = maxfree[i];
2354 } else { 2112 } else {
2355 blocked = GET_MAP_MOVE_BLOCK(mp, nx, ny); 2113 blocked = GET_MAP_MOVE_BLOCK(mp, nx, ny);
2356 2114
2357 if ((move_type & blocked) == move_type) { 2115 if ((move_type & blocked) == move_type) {
2358 max=maxfree[i]; 2116 max=maxfree[i];
2359 } else if (mflags & P_IS_ALIVE) { 2117 } else if (mflags & P_IS_ALIVE) {
2360 for (tmp=GET_MAP_OB(mp,nx,ny); tmp!= NULL; tmp=tmp->above) { 2118 for (tmp=GET_MAP_OB(mp,nx,ny); tmp!= NULL; tmp=tmp->above) {
2361 if ((QUERY_FLAG(tmp,FLAG_MONSTER) || tmp->type==PLAYER) && 2119 if ((QUERY_FLAG(tmp,FLAG_MONSTER) || tmp->type==PLAYER) &&
2362 (tmp != exclude ||(tmp->head && tmp->head != exclude))) { 2120 (tmp != exclude ||(tmp->head && tmp->head != exclude))) {
2363 break; 2121 break;
2364 } 2122 }
2365 } 2123 }
2366 if(tmp) { 2124 if(tmp) {
2367 return freedir[i]; 2125 return freedir[i];
2368 } 2126 }
2369 } 2127 }
2370 } 2128 }
2371 } 2129 }
2372 return 0; 2130 return 0;
2373} 2131}
2374 2132
2375/* 2133/*
… …
2539 if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW)) return 0; 2297 if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW)) return 0;
2540 2298
2541 /* yes, can see. */ 2299 /* yes, can see. */
2542 if(dir < 9) return 1; 2300 if(dir < 9) return 1;
2543 return can_see_monsterP(m, x, y, reduction_dir[dir][0]) | 2301 return can_see_monsterP(m, x, y, reduction_dir[dir][0]) |
2544 can_see_monsterP(m,x,y, reduction_dir[dir][1]) | 2302 can_see_monsterP(m,x,y, reduction_dir[dir][1]) |
2545 can_see_monsterP(m,x,y, reduction_dir[dir][2]); 2303 can_see_monsterP(m,x,y, reduction_dir[dir][2]);
2546} 2304}
2547 2305
2548 2306
2549 2307
2550/* 2308/*
2551 * can_pick(picker, item): finds out if an object is possible to be 2309 * can_pick(picker, item): finds out if an object is possible to be
2552 * picked up by the picker. Returnes 1 if it can be 2310 * picked up by the picker. Returnes 1 if it can be
2553 * picked up, otherwise 0. 2311 * picked up, otherwise 0.
2554 * 2312 *
… …
2559 */ 2317 */
2560 2318
2561int can_pick(const object *who, const object *item) { 2319int can_pick(const object *who, const object *item) {
2562 return /*QUERY_FLAG(who,FLAG_WIZ)||*/ 2320 return /*QUERY_FLAG(who,FLAG_WIZ)||*/
2563 (item->weight>0&&!QUERY_FLAG(item,FLAG_NO_PICK)&& 2321 (item->weight>0&&!QUERY_FLAG(item,FLAG_NO_PICK)&&
2564 !QUERY_FLAG(item,FLAG_ALIVE)&&!item->invisible && 2322 !QUERY_FLAG(item,FLAG_ALIVE)&&!item->invisible &&
2565 (who->type==PLAYER||item->weight<who->weight/3)); 2323 (who->type==PLAYER||item->weight<who->weight/3));
2566} 2324}
2567 2325
2568 2326
2569/* 2327/*
… …
2594 prev->more = tmp; 2352 prev->more = tmp;
2595 prev = tmp; 2353 prev = tmp;
2596 } 2354 }
2597 /*** copy inventory ***/ 2355 /*** copy inventory ***/
2598 for(item = src->inv; item; item = item->below) { 2356 for(item = src->inv; item; item = item->below) {
2599 (void) insert_ob_in_ob(object_create_clone(item),dst); 2357 (void) insert_ob_in_ob(object_create_clone(item),dst);
2600 } 2358 }
2601 2359
2602 return dst; 2360 return dst;
2603} 2361}
2604 2362
… …
2618/* Also remember that multiparts objects are not supported for now. */ 2376/* Also remember that multiparts objects are not supported for now. */
2619 2377
2620object* load_object_str(const char *obstr) 2378object* load_object_str(const char *obstr)
2621{ 2379{
2622 object *op; 2380 object *op;
2623 FILE *tempfile;
2624 char filename[MAX_BUF]; 2381 char filename[MAX_BUF];
2625 sprintf(filename,"%s/cfloadobstr2044",settings.tmpdir); 2382 sprintf(filename,"%s/cfloadobstr2044",settings.tmpdir);
2383
2626 tempfile=fopen(filename,"w"); 2384 FILE *tempfile=fopen(filename,"w");
2627 if (tempfile == NULL) 2385 if (tempfile == NULL)
2628 { 2386 {
2629 LOG(llevError,"Error - Unable to access load object temp file\n"); 2387 LOG(llevError,"Error - Unable to access load object temp file\n");
2630 return NULL; 2388 return NULL;
2631 }; 2389 };
2632 fprintf(tempfile,obstr); 2390 fprintf(tempfile,obstr);
2633 fclose(tempfile); 2391 fclose(tempfile);
2634 2392
2635 op=get_object(); 2393 op=get_object();
2636 2394
2637 tempfile=fopen(filename,"r");
2638 if (tempfile == NULL)
2639 {
2640 LOG(llevError,"Error - Unable to read object temp file\n");
2641 return NULL;
2642 };
2643 object_thawer thawer (tempfile); 2395 object_thawer thawer (filename);
2396
2397 if (thawer)
2644 load_object(thawer,op,LO_NEWFILE,0); 2398 load_object(thawer,op,0);
2399
2645 LOG(llevDebug," load str completed, object=%s\n",op->name); 2400 LOG(llevDebug," load str completed, object=%s\n", &op->name);
2646 CLEAR_FLAG(op,FLAG_REMOVED); 2401 CLEAR_FLAG(op,FLAG_REMOVED);
2647 fclose(tempfile); 2402
2648 return op; 2403 return op;
2649} 2404}
2650 2405
2651/* This returns the first object in who's inventory that 2406/* This returns the first object in who's inventory that
2652 * has the same type and subtype match. 2407 * has the same type and subtype match.
… …
2655object *find_obj_by_type_subtype(const object *who, int type, int subtype) 2410object *find_obj_by_type_subtype(const object *who, int type, int subtype)
2656{ 2411{
2657 object *tmp; 2412 object *tmp;
2658 2413
2659 for (tmp=who->inv; tmp; tmp=tmp->below) 2414 for (tmp=who->inv; tmp; tmp=tmp->below)
2660 if (tmp->type == type && tmp->subtype == subtype) return tmp; 2415 if (tmp->type == type && tmp->subtype == subtype) return tmp;
2661 2416
2662 return NULL; 2417 return NULL;
2663} 2418}
2664 2419
2665/* If ob has a field named key, return the link from the list, 2420/* If ob has a field named key, return the link from the list,
… …
2689 */ 2444 */
2690const char * get_ob_key_value(const object * op, const char * const key) { 2445const char * get_ob_key_value(const object * op, const char * const key) {
2691 key_value * link; 2446 key_value * link;
2692 const char * canonical_key; 2447 const char * canonical_key;
2693 2448
2694 canonical_key = find_string(key); 2449 canonical_key = shstr::find (key);
2695 2450
2696 if (canonical_key == NULL) { 2451 if (canonical_key == NULL) {
2697 /* 1. There being a field named key on any object 2452 /* 1. There being a field named key on any object
2698 * implies there'd be a shared string to find. 2453 * implies there'd be a shared string to find.
2699 * 2. Since there isn't, no object has this field. 2454 * 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 2477 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2723 * keys. 2478 * keys.
2724 * 2479 *
2725 * Returns TRUE on success. 2480 * Returns TRUE on success.
2726 */ 2481 */
2727int set_ob_key_value_s(object * op, const char * canonical_key, const char * value, int add_key) { 2482int set_ob_key_value_s(object * op, const shstr &canonical_key, const char * value, int add_key) {
2728 key_value * field = NULL, *last=NULL; 2483 key_value * field = NULL, *last=NULL;
2729 2484
2730 for (field=op->key_values; field != NULL; field=field->next) { 2485 for (field=op->key_values; field != NULL; field=field->next) {
2731 if (field->key != canonical_key) { 2486 if (field->key != canonical_key) {
2732 last = field; 2487 last = field;
2733 continue; 2488 continue;
2734 } 2489 }
2735 2490
2736 if (field->value) FREE_AND_CLEAR_STR(field->value); 2491 if (value)
2737 if (value) 2492 field->value = value;
2738 field->value = add_string(value); 2493 else {
2739 else {
2740 /* Basically, if the archetype has this key set, 2494 /* Basically, if the archetype has this key set,
2741 * we need to store the null value so when we save 2495 * we need to store the null value so when we save
2742 * it, we save the empty value so that when we load, 2496 * it, we save the empty value so that when we load,
2743 * we get this value back again. 2497 * we get this value back again.
2744 */ 2498 */
2745 if (get_ob_key_link(&op->arch->clone, canonical_key)) 2499 if (get_ob_key_link (&op->arch->clone, canonical_key))
2746 field->value = NULL; 2500 field->value = 0;
2747 else { 2501 else
2748 /* Delete this link */ 2502 {
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; 2503 if (last) last->next = field->next;
2752 else op->key_values = field->next; 2504 else op->key_values = field->next;
2753 free(field); 2505
2754 } 2506 delete field;
2755 } 2507 }
2508 }
2756 return TRUE; 2509 return TRUE;
2757 } 2510 }
2758 /* IF we get here, key doesn't exist */ 2511 /* IF we get here, key doesn't exist */
2759 2512
2760 /* No field, we'll have to add it. */ 2513 /* No field, we'll have to add it. */
… …
2768 * be here. If user wants to store empty strings, 2521 * be here. If user wants to store empty strings,
2769 * should pass in "" 2522 * should pass in ""
2770 */ 2523 */
2771 if (value == NULL) return TRUE; 2524 if (value == NULL) return TRUE;
2772 2525
2773 field = (key_value *) malloc(sizeof(key_value)); 2526 field = new key_value;
2774 2527
2775 field->key = add_refcount(canonical_key); 2528 field->key = canonical_key;
2776 field->value = add_string(value); 2529 field->value = value;
2777 /* Usual prepend-addition. */ 2530 /* Usual prepend-addition. */
2778 field->next = op->key_values; 2531 field->next = op->key_values;
2779 op->key_values = field; 2532 op->key_values = field;
2780 2533
2781 return TRUE; 2534 return TRUE;
… …
2788 * and not add new ones. 2541 * and not add new ones.
2789 * In general, should be little reason FALSE is ever passed in for add_key 2542 * In general, should be little reason FALSE is ever passed in for add_key
2790 * 2543 *
2791 * Returns TRUE on success. 2544 * Returns TRUE on success.
2792 */ 2545 */
2793int set_ob_key_value(object * op, const char * key, const char * value, int add_key) { 2546int set_ob_key_value(object * op, const char *key, const char * value, int add_key)
2794 const char * canonical_key = NULL; 2547{
2795 int floating_ref = FALSE; 2548 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); 2549 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} 2550}

Diff Legend

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