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

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

Diff Legend

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