1 | /* |
1 | /* |
2 | * static char *rcsid_object_c = |
2 | * static char *rcsid_object_c = |
3 | * "$Id: object.C,v 1.1 2006/08/13 17:16:00 elmex Exp $"; |
3 | * "$Id: object.C,v 1.10 2006/08/31 17:54:14 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 | |
… | |
… | |
52 | |
52 | |
53 | object *objects; /* Pointer to the list of used objects */ |
53 | object *objects; /* Pointer to the list of used objects */ |
54 | object *free_objects; /* Pointer to the list of unused objects */ |
54 | object *free_objects; /* Pointer to the list of unused objects */ |
55 | object *active_objects; /* List of active objects that need to be processed */ |
55 | object *active_objects; /* List of active objects that need to be processed */ |
56 | |
56 | |
57 | void (*object_free_callback)(object *ob); |
|
|
58 | |
|
|
59 | short freearr_x[SIZEOFFREE]= |
57 | short 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, |
58 | {0,0,1,1,1,0,-1,-1,-1,0,1,2,2,2,2,2,1,0,-1,-2,-2,-2,-2,-2,-1, |
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}; |
59 | 0,1,2,3,3,3,3,3,3,3,2,1,0,-1,-2,-3,-3,-3,-3,-3,-3,-3,-2,-1}; |
62 | short freearr_y[SIZEOFFREE]= |
60 | short freearr_y[SIZEOFFREE]= |
63 | {0,-1,-1,0,1,1,1,0,-1,-2,-2,-2,-1,0,1,2,2,2,2,2,1,0,-1,-2,-2, |
61 | {0,-1,-1,0,1,1,1,0,-1,-2,-2,-2,-1,0,1,2,2,2,2,2,1,0,-1,-2,-2, |
… | |
… | |
134 | /* Note sure why the following is the case - either the object has to |
132 | /* Note sure why the following is the case - either the object has to |
135 | * be animated or have a very low speed. Is this an attempted monster |
133 | * be animated or have a very low speed. Is this an attempted monster |
136 | * check? |
134 | * check? |
137 | */ |
135 | */ |
138 | if (!QUERY_FLAG(ob1,FLAG_ANIMATE) && FABS((ob1)->speed) > MIN_ACTIVE_SPEED) |
136 | if (!QUERY_FLAG(ob1,FLAG_ANIMATE) && FABS((ob1)->speed) > MIN_ACTIVE_SPEED) |
139 | return 0; |
137 | return 0; |
140 | |
138 | |
141 | /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that |
139 | /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that |
142 | * value could not be stored in a sint32 (which unfortunately sometimes is |
140 | * value could not be stored in a sint32 (which unfortunately sometimes is |
143 | * used to store nrof). |
141 | * used to store nrof). |
144 | */ |
142 | */ |
145 | if (ob1->nrof+ob2->nrof >= 1UL<<31) |
143 | if (ob1->nrof+ob2->nrof >= 1UL<<31) |
146 | return 0; |
144 | return 0; |
147 | |
145 | |
148 | /* This is really a spellbook check - really, we should |
146 | /* This is really a spellbook check - really, we should |
149 | * check all objects in the inventory. |
147 | * check all objects in the inventory. |
150 | */ |
148 | */ |
151 | if (ob1->inv || ob2->inv) { |
149 | if (ob1->inv || ob2->inv) { |
152 | /* if one object has inventory but the other doesn't, not equiv */ |
150 | /* if one object has inventory but the other doesn't, not equiv */ |
153 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) return 0; |
151 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) return 0; |
154 | |
152 | |
155 | /* Now check to see if the two inventory objects could merge */ |
153 | /* Now check to see if the two inventory objects could merge */ |
156 | if (!CAN_MERGE(ob1->inv, ob2->inv)) return 0; |
154 | if (!CAN_MERGE(ob1->inv, ob2->inv)) return 0; |
157 | |
155 | |
158 | /* inventory ok - still need to check rest of this object to see |
156 | /* inventory ok - still need to check rest of this object to see |
159 | * if it is valid. |
157 | * if it is valid. |
160 | */ |
158 | */ |
161 | } |
159 | } |
162 | |
160 | |
163 | /* If the objects have been identified, set the BEEN_APPLIED flag. |
161 | /* 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 |
162 | * 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 |
163 | * 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 |
164 | * are not equal - just if it has been identified, the been_applied |
167 | * flags lose any meaning. |
165 | * flags lose any meaning. |
168 | */ |
166 | */ |
169 | if (QUERY_FLAG(ob1, FLAG_IDENTIFIED)) |
167 | if (QUERY_FLAG(ob1, FLAG_IDENTIFIED)) |
170 | SET_FLAG(ob1, FLAG_BEEN_APPLIED); |
168 | SET_FLAG(ob1, FLAG_BEEN_APPLIED); |
171 | |
169 | |
172 | if (QUERY_FLAG(ob2, FLAG_IDENTIFIED)) |
170 | if (QUERY_FLAG(ob2, FLAG_IDENTIFIED)) |
173 | SET_FLAG(ob2, FLAG_BEEN_APPLIED); |
171 | SET_FLAG(ob2, FLAG_BEEN_APPLIED); |
174 | |
172 | |
175 | |
173 | |
176 | /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something |
174 | /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something |
177 | * being locked in inventory should prevent merging. |
175 | * being locked in inventory should prevent merging. |
178 | * 0x4 in flags3 is CLIENT_SENT |
176 | * 0x4 in flags3 is CLIENT_SENT |
179 | */ |
177 | */ |
180 | if ((ob1->arch != ob2->arch) || |
178 | if ((ob1->arch != ob2->arch) || |
181 | (ob1->flags[0] != ob2->flags[0]) || |
179 | (ob1->flags[0] != ob2->flags[0]) || |
182 | (ob1->flags[1] != ob2->flags[1]) || |
180 | (ob1->flags[1] != ob2->flags[1]) || |
183 | ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~ 0x400000)) || |
181 | ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~ 0x400000)) || |
184 | ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) || |
182 | ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) || |
185 | (ob1->name != ob2->name) || |
183 | (ob1->name != ob2->name) || |
186 | (ob1->title != ob2->title) || |
184 | (ob1->title != ob2->title) || |
187 | (ob1->msg != ob2->msg) || |
185 | (ob1->msg != ob2->msg) || |
188 | (ob1->weight != ob2->weight) || |
186 | (ob1->weight != ob2->weight) || |
189 | (memcmp(&ob1->resist, &ob2->resist, sizeof(ob1->resist))!=0) || |
187 | (memcmp(&ob1->resist, &ob2->resist, sizeof(ob1->resist))!=0) || |
190 | (memcmp(&ob1->stats, &ob2->stats, sizeof(ob1->stats))!=0) || |
188 | (memcmp(&ob1->stats, &ob2->stats, sizeof(ob1->stats))!=0) || |
191 | (ob1->attacktype != ob2->attacktype) || |
189 | (ob1->attacktype != ob2->attacktype) || |
192 | (ob1->magic != ob2->magic) || |
190 | (ob1->magic != ob2->magic) || |
193 | (ob1->slaying != ob2->slaying) || |
191 | (ob1->slaying != ob2->slaying) || |
194 | (ob1->skill != ob2->skill) || |
192 | (ob1->skill != ob2->skill) || |
195 | (ob1->value != ob2->value) || |
193 | (ob1->value != ob2->value) || |
196 | (ob1->animation_id != ob2->animation_id) || |
194 | (ob1->animation_id != ob2->animation_id) || |
197 | (ob1->client_type != ob2->client_type) || |
195 | (ob1->client_type != ob2->client_type) || |
198 | (ob1->materialname != ob2->materialname) || |
196 | (ob1->materialname != ob2->materialname) || |
199 | (ob1->lore != ob2->lore) || |
197 | (ob1->lore != ob2->lore) || |
200 | (ob1->subtype != ob2->subtype) || |
198 | (ob1->subtype != ob2->subtype) || |
201 | (ob1->move_type != ob2->move_type) || |
199 | (ob1->move_type != ob2->move_type) || |
202 | (ob1->move_block != ob2->move_block) || |
200 | (ob1->move_block != ob2->move_block) || |
203 | (ob1->move_allow != ob2->move_allow) || |
201 | (ob1->move_allow != ob2->move_allow) || |
204 | (ob1->move_on != ob2->move_on) || |
202 | (ob1->move_on != ob2->move_on) || |
205 | (ob1->move_off != ob2->move_off) || |
203 | (ob1->move_off != ob2->move_off) || |
206 | (ob1->move_slow != ob2->move_slow) || |
204 | (ob1->move_slow != ob2->move_slow) || |
207 | (ob1->move_slow_penalty != ob2->move_slow_penalty) |
205 | (ob1->move_slow_penalty != ob2->move_slow_penalty) |
208 | ) |
206 | ) |
209 | return 0; |
207 | return 0; |
210 | |
208 | |
211 | /* Don't merge objects that are applied. With the new 'body' code, |
209 | /* 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 |
210 | * 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. |
211 | * some items equipped, and we don't want those to merge. |
214 | */ |
212 | */ |
215 | if (QUERY_FLAG(ob1, FLAG_APPLIED) || QUERY_FLAG(ob2, FLAG_APPLIED)) |
213 | if (QUERY_FLAG(ob1, FLAG_APPLIED) || QUERY_FLAG(ob2, FLAG_APPLIED)) |
216 | return 0; |
214 | return 0; |
217 | |
215 | |
218 | switch (ob1->type) { |
216 | switch (ob1->type) { |
219 | case SCROLL: |
217 | case SCROLL: |
220 | if (ob1->level != ob2->level) return 0; |
218 | if (ob1->level != ob2->level) return 0; |
221 | break; |
219 | break; |
222 | |
220 | |
223 | } |
221 | } |
224 | if (ob1->key_values != NULL || ob2->key_values != NULL) { |
222 | if (ob1->key_values != NULL || ob2->key_values != NULL) { |
225 | /* At least one of these has key_values. */ |
223 | /* At least one of these has key_values. */ |
226 | if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) { |
224 | if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) { |
… | |
… | |
243 | signed long sum_weight(object *op) { |
241 | signed long sum_weight(object *op) { |
244 | signed long sum; |
242 | signed long sum; |
245 | object *inv; |
243 | object *inv; |
246 | for(sum = 0, inv = op->inv; inv != NULL; inv = inv->below) { |
244 | for(sum = 0, inv = op->inv; inv != NULL; inv = inv->below) { |
247 | if (inv->inv) |
245 | if (inv->inv) |
248 | sum_weight(inv); |
246 | sum_weight(inv); |
249 | sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); |
247 | sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); |
250 | } |
248 | } |
251 | if (op->type == CONTAINER && op->stats.Str) |
249 | if (op->type == CONTAINER && op->stats.Str) |
252 | sum = (sum * (100 - op->stats.Str))/100; |
250 | sum = (sum * (100 - op->stats.Str))/100; |
253 | if(op->carrying != sum) |
251 | if(op->carrying != sum) |
… | |
… | |
272 | */ |
270 | */ |
273 | |
271 | |
274 | object *is_player_inv (object *op) { |
272 | object *is_player_inv (object *op) { |
275 | for (;op!=NULL&&op->type!=PLAYER; op=op->env) |
273 | for (;op!=NULL&&op->type!=PLAYER; op=op->env) |
276 | if (op->env==op) |
274 | if (op->env==op) |
277 | op->env = NULL; |
275 | op->env = NULL; |
278 | return op; |
276 | return op; |
279 | } |
277 | } |
280 | |
278 | |
281 | /* |
279 | /* |
282 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
280 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
283 | * Some error messages. |
281 | * Some error messages. |
284 | * The result of the dump is stored in the static global errmsg array. |
282 | * The result of the dump is stored in the static global errmsg array. |
285 | */ |
283 | */ |
286 | |
284 | |
287 | void dump_object2(object *op) { |
285 | void dump_object2(object *op) { |
|
|
286 | errmsg[0] = 0; |
|
|
287 | return; |
|
|
288 | //TODO//D#d# |
|
|
289 | #if 0 |
288 | char *cp; |
290 | char *cp; |
289 | /* object *tmp;*/ |
291 | /* object *tmp;*/ |
290 | |
292 | |
291 | if(op->arch!=NULL) { |
293 | if(op->arch!=NULL) { |
292 | strcat(errmsg,"arch "); |
294 | strcat(errmsg,"arch "); |
293 | strcat(errmsg,op->arch->name?op->arch->name:"(null)"); |
295 | strcat(errmsg,op->arch->name?op->arch->name:"(null)"); |
294 | strcat(errmsg,"\n"); |
296 | strcat(errmsg,"\n"); |
295 | if((cp=get_ob_diff(op,&empty_archetype->clone))!=NULL) |
297 | if((cp=get_ob_diff(op,&empty_archetype->clone))!=NULL) |
296 | strcat(errmsg,cp); |
298 | strcat(errmsg,cp); |
297 | #if 0 |
299 | #if 0 |
298 | /* Don't dump player diffs - they are too long, mostly meaningless, and |
300 | /* Don't dump player diffs - they are too long, mostly meaningless, and |
299 | * will overflow the buffer. |
301 | * will overflow the buffer. |
300 | * Changed so that we don't dump inventory either. This may |
302 | * Changed so that we don't dump inventory either. This may |
301 | * also overflow the buffer. |
303 | * also overflow the buffer. |
… | |
… | |
317 | for (tmp=op->inv; tmp; tmp=tmp->below) |
319 | for (tmp=op->inv; tmp; tmp=tmp->below) |
318 | dump_object2(tmp); |
320 | dump_object2(tmp); |
319 | #endif |
321 | #endif |
320 | strcat(errmsg,"end\n"); |
322 | strcat(errmsg,"end\n"); |
321 | } |
323 | } |
|
|
324 | #endif |
322 | } |
325 | } |
323 | |
326 | |
324 | /* |
327 | /* |
325 | * Dumps an object. Returns output in the static global errmsg array. |
328 | * Dumps an object. Returns output in the static global errmsg array. |
326 | */ |
329 | */ |
… | |
… | |
331 | return; |
334 | return; |
332 | } |
335 | } |
333 | errmsg[0]='\0'; |
336 | errmsg[0]='\0'; |
334 | dump_object2(op); |
337 | dump_object2(op); |
335 | } |
338 | } |
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. */ |
|
|
340 | void 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 | |
339 | |
377 | void dump_all_objects(void) { |
340 | void dump_all_objects(void) { |
378 | object *op; |
341 | object *op; |
379 | for(op=objects;op!=NULL;op=op->next) { |
342 | for(op=objects;op!=NULL;op=op->next) { |
380 | dump_object(op); |
343 | dump_object(op); |
… | |
… | |
430 | void free_all_object_data(void) { |
393 | void free_all_object_data(void) { |
431 | #ifdef MEMORY_DEBUG |
394 | #ifdef MEMORY_DEBUG |
432 | object *op, *next; |
395 | object *op, *next; |
433 | |
396 | |
434 | for (op=free_objects; op!=NULL; ) { |
397 | for (op=free_objects; op!=NULL; ) { |
435 | next=op->next; |
398 | next=op->next; |
436 | free(op); |
399 | free(op); |
437 | nrofallocobjects--; |
400 | nrofallocobjects--; |
438 | nroffreeobjects--; |
401 | nroffreeobjects--; |
439 | op=next; |
402 | op=next; |
440 | } |
403 | } |
441 | #endif |
404 | #endif |
442 | LOG(llevDebug,"%d allocated objects, %d free objects, STARMAX=%d\n", |
405 | LOG(llevDebug,"%d allocated objects, %d free objects, STARMAX=%d\n", |
443 | nrofallocobjects, nroffreeobjects,STARTMAX); |
406 | nrofallocobjects, nroffreeobjects,STARTMAX); |
444 | } |
407 | } |
445 | |
408 | |
446 | /* |
409 | /* |
447 | * Returns the object which this object marks as being the owner. |
410 | * 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 |
411 | * 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. |
417 | * anything - once an object is removed, it is basically dead anyways. |
455 | */ |
418 | */ |
456 | |
419 | |
457 | object *get_owner(object *op) { |
420 | object *get_owner(object *op) { |
458 | if(op->owner==NULL) |
421 | if(op->owner==NULL) |
459 | return NULL; |
422 | return NULL; |
460 | |
423 | |
461 | if (!QUERY_FLAG(op->owner,FLAG_FREED) && !QUERY_FLAG(op->owner, FLAG_REMOVED) && |
424 | if (!QUERY_FLAG(op->owner,FLAG_FREED) && !QUERY_FLAG(op->owner, FLAG_REMOVED) && |
462 | op->owner->count==op->ownercount) |
425 | op->owner->count==op->ownercount) |
463 | return op->owner; |
426 | return op->owner; |
464 | |
427 | |
465 | op->owner=NULL; |
428 | op->owner=NULL; |
466 | op->ownercount=0; |
429 | op->ownercount=0; |
467 | return NULL; |
430 | return NULL; |
468 | } |
431 | } |
… | |
… | |
470 | void clear_owner(object *op) |
433 | void clear_owner(object *op) |
471 | { |
434 | { |
472 | if (!op) return; |
435 | if (!op) return; |
473 | |
436 | |
474 | if (op->owner && op->ownercount == op->owner->count) |
437 | if (op->owner && op->ownercount == op->owner->count) |
475 | op->owner->refcount--; |
438 | op->owner->refcount--; |
476 | |
439 | |
477 | op->owner = NULL; |
440 | op->owner = NULL; |
478 | op->ownercount = 0; |
441 | op->ownercount = 0; |
479 | } |
442 | } |
480 | |
443 | |
… | |
… | |
485 | * skill and experience objects. |
448 | * skill and experience objects. |
486 | */ |
449 | */ |
487 | void set_owner (object *op, object *owner) |
450 | void set_owner (object *op, object *owner) |
488 | { |
451 | { |
489 | if(owner==NULL||op==NULL) |
452 | if(owner==NULL||op==NULL) |
490 | return; |
453 | return; |
491 | |
454 | |
492 | /* next line added to allow objects which own objects */ |
455 | /* next line added to allow objects which own objects */ |
493 | /* Add a check for ownercounts in here, as I got into an endless loop |
456 | /* 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 |
457 | * with the fireball owning a poison cloud which then owned the |
495 | * fireball. I believe that was caused by one of the objects getting |
458 | * fireball. I believe that was caused by one of the objects getting |
496 | * freed and then another object replacing it. Since the ownercounts |
459 | * 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. |
460 | * didn't match, this check is valid and I believe that cause is valid. |
498 | */ |
461 | */ |
499 | while (owner->owner && owner!=owner->owner && |
462 | while (owner->owner && owner!=owner->owner && |
500 | owner->ownercount==owner->owner->count) owner=owner->owner; |
463 | owner->ownercount==owner->owner->count) owner=owner->owner; |
501 | |
464 | |
502 | /* IF the owner still has an owner, we did not resolve to a final owner. |
465 | /* IF the owner still has an owner, we did not resolve to a final owner. |
503 | * so lets not add to that. |
466 | * so lets not add to that. |
504 | */ |
467 | */ |
505 | if (owner->owner) return; |
468 | if (owner->owner) return; |
… | |
… | |
523 | */ |
486 | */ |
524 | void copy_owner (object *op, object *clone) |
487 | void copy_owner (object *op, object *clone) |
525 | { |
488 | { |
526 | object *owner = get_owner (clone); |
489 | object *owner = get_owner (clone); |
527 | if (owner == NULL) { |
490 | if (owner == NULL) { |
528 | /* players don't have owners - they own themselves. Update |
491 | /* players don't have owners - they own themselves. Update |
529 | * as appropriate. |
492 | * as appropriate. |
530 | */ |
493 | */ |
531 | if (clone->type == PLAYER) owner=clone; |
494 | if (clone->type == PLAYER) owner=clone; |
532 | else return; |
495 | else return; |
533 | } |
496 | } |
534 | set_owner(op, owner); |
497 | set_owner(op, owner); |
535 | |
498 | |
536 | } |
499 | } |
537 | |
500 | |
… | |
… | |
548 | op->slaying = NULL; |
511 | op->slaying = NULL; |
549 | op->skill = NULL; |
512 | op->skill = NULL; |
550 | op->msg = NULL; |
513 | op->msg = NULL; |
551 | op->materialname = NULL; |
514 | op->materialname = NULL; |
552 | op->lore = NULL; |
515 | op->lore = NULL; |
553 | op->current_weapon_script = NULL; |
|
|
554 | clear_object(op); |
516 | clear_object(op); |
555 | } |
517 | } |
556 | |
518 | |
557 | /* Zero the key_values on op, decrementing the shared-string |
519 | /* Zero the key_values on op, decrementing the shared-string |
558 | * refcounts and freeing the links. |
520 | * refcounts and freeing the links. |
… | |
… | |
565 | |
527 | |
566 | for (i = op->key_values; i != NULL; i = next) { |
528 | for (i = op->key_values; i != NULL; i = next) { |
567 | /* Store next *first*. */ |
529 | /* Store next *first*. */ |
568 | next = i->next; |
530 | next = i->next; |
569 | |
531 | |
570 | if (i->key) FREE_AND_CLEAR_STR(i->key); |
532 | if (i->key) FREE_AND_CLEAR_STR(i->key); |
571 | if (i->value) FREE_AND_CLEAR_STR(i->value); |
533 | if (i->value) FREE_AND_CLEAR_STR(i->value); |
572 | i->next = NULL; |
534 | i->next = NULL; |
573 | free(i); |
535 | free(i); |
574 | } |
536 | } |
575 | |
537 | |
576 | op->key_values = NULL; |
538 | op->key_values = NULL; |
… | |
… | |
581 | * clear_object() frees everything allocated by an object, and also |
543 | * clear_object() frees everything allocated by an object, and also |
582 | * clears all variables and flags to default settings. |
544 | * clears all variables and flags to default settings. |
583 | */ |
545 | */ |
584 | |
546 | |
585 | void clear_object(object *op) { |
547 | void clear_object(object *op) { |
|
|
548 | op->clear (); |
586 | |
549 | |
587 | event *evt; |
550 | event *evt; |
588 | event *evt2; |
551 | event *evt2; |
589 | |
552 | |
590 | /* redo this to be simpler/more efficient. Was also seeing |
553 | /* redo this to be simpler/more efficient. Was also seeing |
591 | * crashes in the old code. Move this to the top - am |
554 | * crashes in the old code. Move this to the top - am |
592 | * seeing periodic crashes in this code, and would like to have |
555 | * seeing periodic crashes in this code, and would like to have |
593 | * as much info available as possible (eg, object name). |
556 | * as much info available as possible (eg, object name). |
594 | */ |
557 | */ |
595 | for (evt = op->events; evt; evt=evt2) { |
558 | for (evt = op->events; evt; evt=evt2) { |
596 | evt2 = evt->next; |
559 | evt2 = evt->next; |
597 | |
560 | |
598 | if (evt->hook != NULL) FREE_AND_CLEAR_STR(evt->hook); |
561 | if (evt->hook != NULL) FREE_AND_CLEAR_STR(evt->hook); |
599 | if (evt->plugin != NULL) FREE_AND_CLEAR_STR(evt->plugin); |
562 | if (evt->plugin != NULL) FREE_AND_CLEAR_STR(evt->plugin); |
600 | if (evt->options != NULL) FREE_AND_CLEAR_STR(evt->options); |
563 | if (evt->options != NULL) FREE_AND_CLEAR_STR(evt->options); |
601 | |
564 | |
… | |
… | |
644 | |
607 | |
645 | op->expmul=1.0; |
608 | op->expmul=1.0; |
646 | op->face = blank_face; |
609 | op->face = blank_face; |
647 | op->attacked_by_count = (tag_t) -1; |
610 | op->attacked_by_count = (tag_t) -1; |
648 | if (settings.casting_time) |
611 | if (settings.casting_time) |
649 | op->casting_time = -1; |
612 | op->casting_time = -1; |
650 | |
613 | |
651 | } |
614 | } |
652 | |
615 | |
653 | /* |
616 | /* |
654 | * copy object first frees everything allocated by the second object, |
617 | * copy object first frees everything allocated by the second object, |
… | |
… | |
660 | */ |
623 | */ |
661 | |
624 | |
662 | void copy_object(object *op2, object *op) { |
625 | void copy_object(object *op2, object *op) { |
663 | int is_freed=QUERY_FLAG(op,FLAG_FREED),is_removed=QUERY_FLAG(op,FLAG_REMOVED); |
626 | int is_freed=QUERY_FLAG(op,FLAG_FREED),is_removed=QUERY_FLAG(op,FLAG_REMOVED); |
664 | event *evt, *evt2, *evt_new; |
627 | event *evt, *evt2, *evt_new; |
|
|
628 | |
|
|
629 | op->clear (); |
665 | |
630 | |
666 | /* Decrement the refcounts, but don't bother zeroing the fields; |
631 | /* Decrement the refcounts, but don't bother zeroing the fields; |
667 | they'll be overwritten by memcpy. */ |
632 | they'll be overwritten by memcpy. */ |
668 | if(op->name!=NULL) free_string(op->name); |
633 | if(op->name!=NULL) free_string(op->name); |
669 | if(op->name_pl!=NULL) free_string(op->name_pl); |
634 | if(op->name_pl!=NULL) free_string(op->name_pl); |
… | |
… | |
676 | if(op->materialname != NULL) free_string(op->materialname); |
641 | if(op->materialname != NULL) free_string(op->materialname); |
677 | if(op->custom_name != NULL) free_string(op->custom_name); |
642 | if(op->custom_name != NULL) free_string(op->custom_name); |
678 | |
643 | |
679 | /* Basically, same code as from clear_object() */ |
644 | /* Basically, same code as from clear_object() */ |
680 | for (evt = op->events; evt; evt=evt2) { |
645 | for (evt = op->events; evt; evt=evt2) { |
681 | evt2 = evt->next; |
646 | evt2 = evt->next; |
682 | |
647 | |
683 | if (evt->hook != NULL) FREE_AND_CLEAR_STR(evt->hook); |
648 | if (evt->hook != NULL) FREE_AND_CLEAR_STR(evt->hook); |
684 | if (evt->plugin != NULL) FREE_AND_CLEAR_STR(evt->plugin); |
649 | if (evt->plugin != NULL) FREE_AND_CLEAR_STR(evt->plugin); |
685 | if (evt->options != NULL) FREE_AND_CLEAR_STR(evt->options); |
650 | if (evt->options != NULL) FREE_AND_CLEAR_STR(evt->options); |
686 | |
651 | |
687 | free(evt); |
652 | free(evt); |
688 | } |
653 | } |
689 | op->events = NULL; |
654 | op->events = NULL; |
690 | |
655 | |
691 | free_key_values(op); |
656 | free_key_values(op); |
692 | |
657 | |
693 | *(object_special *)op = *(object_special *)op2; |
658 | *(object_special *)op = *(object_special *)op2; |
|
|
659 | op2->clone (op); |
694 | |
660 | |
695 | if(is_freed) SET_FLAG(op,FLAG_FREED); |
661 | if(is_freed) SET_FLAG(op,FLAG_FREED); |
696 | if(is_removed) SET_FLAG(op,FLAG_REMOVED); |
662 | if(is_removed) SET_FLAG(op,FLAG_REMOVED); |
697 | if(op->name!=NULL) add_refcount(op->name); |
663 | if(op->name!=NULL) add_refcount(op->name); |
698 | if(op->name_pl!=NULL) add_refcount(op->name_pl); |
664 | if(op->name_pl!=NULL) add_refcount(op->name_pl); |
… | |
… | |
704 | if(op->msg!=NULL) add_refcount(op->msg); |
670 | if(op->msg!=NULL) add_refcount(op->msg); |
705 | if(op->custom_name!=NULL) add_refcount(op->custom_name); |
671 | if(op->custom_name!=NULL) add_refcount(op->custom_name); |
706 | if (op->materialname != NULL) add_refcount(op->materialname); |
672 | if (op->materialname != NULL) add_refcount(op->materialname); |
707 | |
673 | |
708 | if((op2->speed<0) && !editor) |
674 | if((op2->speed<0) && !editor) |
709 | op->speed_left=op2->speed_left-RANDOM()%200/100.0; |
675 | op->speed_left=op2->speed_left-RANDOM()%200/100.0; |
710 | |
676 | |
711 | /* Copy over event information */ |
677 | /* Copy over event information */ |
712 | evt2 = NULL; |
678 | evt2 = NULL; |
713 | for (evt = op2->events; evt; evt=evt->next) { |
679 | for (evt = op2->events; evt; evt=evt->next) { |
714 | evt_new = (event *) malloc(sizeof(event)); |
680 | evt_new = (event *) malloc(sizeof(event)); |
715 | memcpy(evt_new, evt, sizeof(event)); |
681 | memcpy(evt_new, evt, sizeof(event)); |
716 | if (evt_new->hook) add_refcount(evt_new->hook); |
682 | if (evt_new->hook) add_refcount(evt_new->hook); |
717 | if (evt_new->plugin) add_refcount(evt_new->plugin); |
683 | if (evt_new->plugin) add_refcount(evt_new->plugin); |
718 | if (evt_new->options) add_refcount(evt_new->options); |
684 | if (evt_new->options) add_refcount(evt_new->options); |
719 | evt_new->next = NULL; |
685 | evt_new->next = NULL; |
720 | |
686 | |
721 | /* Try to be a little clever here, and store away the |
687 | /* Try to be a little clever here, and store away the |
722 | * last event we copied, so that its simpler to update the |
688 | * last event we copied, so that its simpler to update the |
723 | * pointer. |
689 | * pointer. |
724 | */ |
690 | */ |
725 | if (evt2) |
691 | if (evt2) |
726 | evt2->next = evt_new; |
692 | evt2->next = evt_new; |
727 | else |
693 | else |
728 | op->events = evt_new; |
694 | op->events = evt_new; |
729 | |
695 | |
730 | evt2 = evt_new; |
696 | evt2 = evt_new; |
731 | } |
697 | } |
732 | /* Copy over key_values, if any. */ |
698 | /* Copy over key_values, if any. */ |
733 | if (op2->key_values != NULL) { |
699 | if (op2->key_values != NULL) { |
734 | key_value * tail = NULL; |
700 | key_value * tail = NULL; |
735 | key_value * i; |
701 | key_value * i; |
736 | |
702 | |
737 | op->key_values = NULL; |
703 | op->key_values = NULL; |
738 | |
704 | |
739 | for (i = op2->key_values; i != NULL; i = i->next) { |
705 | for (i = op2->key_values; i != NULL; i = i->next) { |
740 | key_value * new_link = (key_value *) malloc(sizeof(key_value)); |
706 | key_value * new_link = (key_value *) malloc(sizeof(key_value)); |
741 | |
707 | |
742 | new_link->next = NULL; |
708 | new_link->next = NULL; |
743 | new_link->key = add_refcount(i->key); |
709 | new_link->key = add_refcount(i->key); |
744 | if (i->value) |
710 | if (i->value) |
745 | new_link->value = add_refcount(i->value); |
711 | new_link->value = add_refcount(i->value); |
746 | else |
712 | else |
747 | new_link->value = NULL; |
713 | new_link->value = NULL; |
748 | |
714 | |
749 | /* Try and be clever here, too. */ |
715 | /* Try and be clever here, too. */ |
750 | if (op->key_values == NULL) { |
716 | if (op->key_values == NULL) { |
751 | op->key_values = new_link; |
717 | op->key_values = new_link; |
752 | tail = new_link; |
718 | tail = new_link; |
753 | } else { |
719 | } else { |
754 | tail->next = new_link; |
720 | tail->next = new_link; |
755 | tail = new_link; |
721 | tail = new_link; |
|
|
722 | } |
|
|
723 | } |
756 | } |
724 | } |
757 | } |
725 | |
758 | } |
|
|
759 | |
|
|
760 | update_ob_speed(op); |
726 | update_ob_speed(op); |
761 | } |
727 | } |
762 | |
728 | |
763 | /* |
729 | /* |
764 | * expand_objects() allocates more objects for the list of unused objects. |
730 | * expand_objects() allocates more objects for the list of unused objects. |
… | |
… | |
851 | * be called to update the face variable, _and_ how it looks on the map. |
817 | * be called to update the face variable, _and_ how it looks on the map. |
852 | */ |
818 | */ |
853 | |
819 | |
854 | void update_turn_face(object *op) { |
820 | void update_turn_face(object *op) { |
855 | if(!QUERY_FLAG(op,FLAG_IS_TURNABLE)||op->arch==NULL) |
821 | if(!QUERY_FLAG(op,FLAG_IS_TURNABLE)||op->arch==NULL) |
856 | return; |
822 | return; |
857 | SET_ANIMATION(op, op->direction); |
823 | SET_ANIMATION(op, op->direction); |
858 | update_object(op,UP_OBJ_FACE); |
824 | update_object(op,UP_OBJ_FACE); |
859 | } |
825 | } |
860 | |
826 | |
861 | /* |
827 | /* |
… | |
… | |
870 | /* No reason putting the archetypes objects on the speed list, |
836 | /* No reason putting the archetypes objects on the speed list, |
871 | * since they never really need to be updated. |
837 | * since they never really need to be updated. |
872 | */ |
838 | */ |
873 | |
839 | |
874 | if (QUERY_FLAG(op, FLAG_FREED) && op->speed) { |
840 | if (QUERY_FLAG(op, FLAG_FREED) && op->speed) { |
875 | LOG(llevError,"Object %s is freed but has speed.\n", op->name); |
841 | LOG(llevError,"Object %s is freed but has speed.\n", op->name); |
876 | #ifdef MANY_CORES |
842 | #ifdef MANY_CORES |
877 | abort(); |
843 | abort(); |
878 | #else |
844 | #else |
879 | op->speed = 0; |
845 | op->speed = 0; |
880 | #endif |
846 | #endif |
881 | } |
847 | } |
882 | if (arch_init) { |
848 | if (arch_init) { |
883 | return; |
849 | return; |
884 | } |
850 | } |
885 | if (FABS(op->speed)>MIN_ACTIVE_SPEED) { |
851 | if (FABS(op->speed)>MIN_ACTIVE_SPEED) { |
886 | /* If already on active list, don't do anything */ |
852 | /* If already on active list, don't do anything */ |
887 | if (op->active_next || op->active_prev || op==active_objects) |
853 | if (op->active_next || op->active_prev || op==active_objects) |
888 | return; |
854 | return; |
889 | |
855 | |
890 | /* process_events() expects us to insert the object at the beginning |
856 | /* process_events() expects us to insert the object at the beginning |
891 | * of the list. */ |
857 | * of the list. */ |
892 | op->active_next = active_objects; |
858 | op->active_next = active_objects; |
893 | if (op->active_next!=NULL) |
859 | if (op->active_next!=NULL) |
894 | op->active_next->active_prev = op; |
860 | op->active_next->active_prev = op; |
895 | active_objects = op; |
861 | active_objects = op; |
896 | } |
862 | } |
897 | else { |
863 | else { |
898 | /* If not on the active list, nothing needs to be done */ |
864 | /* If not on the active list, nothing needs to be done */ |
899 | if (!op->active_next && !op->active_prev && op!=active_objects) |
865 | if (!op->active_next && !op->active_prev && op!=active_objects) |
900 | return; |
866 | return; |
901 | |
867 | |
902 | if (op->active_prev==NULL) { |
868 | if (op->active_prev==NULL) { |
903 | active_objects = op->active_next; |
869 | active_objects = op->active_next; |
904 | if (op->active_next!=NULL) |
870 | if (op->active_next!=NULL) |
905 | op->active_next->active_prev = NULL; |
871 | op->active_next->active_prev = NULL; |
906 | } |
872 | } |
907 | else { |
873 | else { |
908 | op->active_prev->active_next = op->active_next; |
874 | op->active_prev->active_next = op->active_next; |
909 | if (op->active_next) |
875 | if (op->active_next) |
910 | op->active_next->active_prev = op->active_prev; |
876 | op->active_next->active_prev = op->active_prev; |
911 | } |
877 | } |
912 | op->active_next = NULL; |
878 | op->active_next = NULL; |
913 | op->active_prev = NULL; |
879 | op->active_prev = NULL; |
914 | } |
880 | } |
915 | } |
881 | } |
916 | |
882 | |
917 | /* This function removes object 'op' from the list of active |
883 | /* This function removes object 'op' from the list of active |
918 | * objects. |
884 | * objects. |
… | |
… | |
924 | */ |
890 | */ |
925 | void remove_from_active_list(object *op) |
891 | void remove_from_active_list(object *op) |
926 | { |
892 | { |
927 | /* If not on the active list, nothing needs to be done */ |
893 | /* If not on the active list, nothing needs to be done */ |
928 | if (!op->active_next && !op->active_prev && op!=active_objects) |
894 | if (!op->active_next && !op->active_prev && op!=active_objects) |
929 | return; |
895 | return; |
930 | |
896 | |
931 | if (op->active_prev==NULL) { |
897 | if (op->active_prev==NULL) { |
932 | active_objects = op->active_next; |
898 | active_objects = op->active_next; |
933 | if (op->active_next!=NULL) |
899 | if (op->active_next!=NULL) |
934 | op->active_next->active_prev = NULL; |
900 | op->active_next->active_prev = NULL; |
935 | } |
901 | } |
936 | else { |
902 | else { |
937 | op->active_prev->active_next = op->active_next; |
903 | op->active_prev->active_next = op->active_next; |
938 | if (op->active_next) |
904 | if (op->active_next) |
939 | op->active_next->active_prev = op->active_prev; |
905 | op->active_next->active_prev = op->active_prev; |
940 | } |
906 | } |
941 | op->active_next = NULL; |
907 | op->active_next = NULL; |
942 | op->active_prev = NULL; |
908 | op->active_prev = NULL; |
943 | } |
909 | } |
944 | |
910 | |
… | |
… | |
969 | MoveType move_on, move_off, move_block, move_slow; |
935 | MoveType move_on, move_off, move_block, move_slow; |
970 | |
936 | |
971 | if (op == NULL) { |
937 | if (op == NULL) { |
972 | /* this should never happen */ |
938 | /* this should never happen */ |
973 | LOG(llevDebug,"update_object() called for NULL object.\n"); |
939 | LOG(llevDebug,"update_object() called for NULL object.\n"); |
974 | return; |
940 | return; |
975 | } |
941 | } |
976 | |
942 | |
977 | if(op->env!=NULL) { |
943 | if(op->env!=NULL) { |
978 | /* Animation is currently handled by client, so nothing |
944 | /* Animation is currently handled by client, so nothing |
979 | * to do in this case. |
945 | * to do in this case. |
980 | */ |
946 | */ |
981 | return; |
947 | return; |
982 | } |
948 | } |
983 | |
949 | |
984 | /* If the map is saving, don't do anything as everything is |
950 | /* If the map is saving, don't do anything as everything is |
985 | * going to get freed anyways. |
951 | * going to get freed anyways. |
986 | */ |
952 | */ |
987 | if (!op->map || op->map->in_memory == MAP_SAVING) return; |
953 | if (!op->map || op->map->in_memory == MAP_SAVING) return; |
988 | |
954 | |
989 | /* make sure the object is within map boundaries */ |
955 | /* make sure the object is within map boundaries */ |
990 | if (op->x < 0 || op->x >= MAP_WIDTH(op->map) || |
956 | if (op->x < 0 || op->x >= MAP_WIDTH(op->map) || |
991 | op->y < 0 || op->y >= MAP_HEIGHT(op->map)) { |
957 | op->y < 0 || op->y >= MAP_HEIGHT(op->map)) { |
992 | LOG(llevError,"update_object() called for object out of map!\n"); |
958 | LOG(llevError,"update_object() called for object out of map!\n"); |
993 | #ifdef MANY_CORES |
959 | #ifdef MANY_CORES |
994 | abort(); |
960 | abort(); |
995 | #endif |
961 | #endif |
996 | return; |
962 | return; |
997 | } |
963 | } |
998 | |
964 | |
999 | flags = GET_MAP_FLAGS(op->map, op->x, op->y); |
965 | flags = GET_MAP_FLAGS(op->map, op->x, op->y); |
1000 | SET_MAP_FLAGS(op->map, op->x, op->y, flags | P_NEED_UPDATE); |
966 | SET_MAP_FLAGS(op->map, op->x, op->y, flags | P_NEED_UPDATE); |
1001 | move_slow = GET_MAP_MOVE_SLOW(op->map, op->x, op->y); |
967 | move_slow = GET_MAP_MOVE_SLOW(op->map, op->x, op->y); |
… | |
… | |
1014 | update_now=1; |
980 | update_now=1; |
1015 | |
981 | |
1016 | if (QUERY_FLAG(op, FLAG_ALIVE) && !(flags & P_IS_ALIVE)) |
982 | if (QUERY_FLAG(op, FLAG_ALIVE) && !(flags & P_IS_ALIVE)) |
1017 | update_now=1; |
983 | update_now=1; |
1018 | |
984 | |
1019 | if ((move_on | op->move_on) != move_on) update_now=1; |
985 | if ((move_on | op->move_on) != move_on) update_now=1; |
1020 | if ((move_off | op->move_off) != move_off) update_now=1; |
986 | if ((move_off | op->move_off) != move_off) update_now=1; |
1021 | /* This isn't perfect, but I don't expect a lot of objects to |
987 | /* This isn't perfect, but I don't expect a lot of objects to |
1022 | * to have move_allow right now. |
988 | * to have move_allow right now. |
1023 | */ |
989 | */ |
1024 | if (((move_block | op->move_block) & ~op->move_allow) != move_block) |
990 | if (((move_block | op->move_block) & ~op->move_allow) != move_block) |
1025 | update_now=1; |
991 | update_now=1; |
1026 | if ((move_slow | op->move_slow) != move_slow) update_now=1; |
992 | if ((move_slow | op->move_slow) != move_slow) update_now=1; |
1027 | } |
993 | } |
1028 | /* if the object is being removed, we can't make intelligent |
994 | /* if the object is being removed, we can't make intelligent |
1029 | * decisions, because remove_ob can't really pass the object |
995 | * decisions, because remove_ob can't really pass the object |
1030 | * that is being removed. |
996 | * that is being removed. |
1031 | */ |
997 | */ |
1032 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) { |
998 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) { |
1033 | update_now=1; |
999 | update_now=1; |
1034 | } else if (action == UP_OBJ_FACE) { |
1000 | } else if (action == UP_OBJ_FACE) { |
1035 | /* Nothing to do for that case */ |
1001 | /* Nothing to do for that case */ |
1036 | } |
1002 | } |
1037 | else { |
1003 | else { |
1038 | LOG(llevError,"update_object called with invalid action: %d\n", action); |
1004 | LOG(llevError,"update_object called with invalid action: %d\n", action); |
1039 | } |
1005 | } |
1040 | |
1006 | |
1041 | if (update_now) { |
1007 | if (update_now) { |
1042 | SET_MAP_FLAGS(op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE); |
1008 | SET_MAP_FLAGS(op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE); |
1043 | update_position(op->map, op->x, op->y); |
1009 | update_position(op->map, op->x, op->y); |
1044 | } |
1010 | } |
1045 | |
1011 | |
1046 | if(op->more!=NULL) |
1012 | if(op->more!=NULL) |
1047 | update_object(op->more, action); |
1013 | update_object(op->more, action); |
1048 | } |
1014 | } |
1049 | |
1015 | |
1050 | |
1016 | |
1051 | /* |
1017 | /* |
1052 | * free_object() frees everything allocated by an object, removes |
1018 | * free_object() frees everything allocated by an object, removes |
… | |
… | |
1063 | free_object2(ob, 0); |
1029 | free_object2(ob, 0); |
1064 | } |
1030 | } |
1065 | void free_object2(object *ob, int free_inventory) { |
1031 | void free_object2(object *ob, int free_inventory) { |
1066 | object *tmp,*op; |
1032 | object *tmp,*op; |
1067 | |
1033 | |
1068 | if (object_free_callback) |
1034 | ob->clear (); |
1069 | object_free_callback (ob); |
|
|
1070 | |
1035 | |
1071 | if (!QUERY_FLAG(ob,FLAG_REMOVED)) { |
1036 | if (!QUERY_FLAG(ob,FLAG_REMOVED)) { |
1072 | LOG(llevDebug,"Free object called with non removed object\n"); |
1037 | LOG(llevDebug,"Free object called with non removed object\n"); |
1073 | dump_object(ob); |
1038 | dump_object(ob); |
1074 | #ifdef MANY_CORES |
1039 | #ifdef MANY_CORES |
1075 | abort(); |
1040 | abort(); |
1076 | #endif |
1041 | #endif |
1077 | } |
1042 | } |
1078 | if(QUERY_FLAG(ob,FLAG_FRIENDLY)) { |
1043 | if(QUERY_FLAG(ob,FLAG_FRIENDLY)) { |
1079 | LOG(llevMonster,"Warning: tried to free friendly object.\n"); |
1044 | LOG(llevMonster,"Warning: tried to free friendly object.\n"); |
1080 | remove_friendly_object(ob); |
1045 | remove_friendly_object(ob); |
1081 | } |
1046 | } |
1082 | if(QUERY_FLAG(ob,FLAG_FREED)) { |
1047 | if(QUERY_FLAG(ob,FLAG_FREED)) { |
1083 | dump_object(ob); |
1048 | dump_object(ob); |
1084 | LOG(llevError,"Trying to free freed object.\n%s\n",errmsg); |
1049 | LOG(llevError,"Trying to free freed object.\n%s\n",errmsg); |
1085 | return; |
1050 | return; |
1086 | } |
1051 | } |
1087 | if(ob->more!=NULL) { |
1052 | if(ob->more!=NULL) { |
1088 | free_object2(ob->more, free_inventory); |
1053 | free_object2(ob->more, free_inventory); |
1089 | ob->more=NULL; |
1054 | ob->more=NULL; |
1090 | } |
1055 | } |
1091 | if (ob->inv) { |
1056 | if (ob->inv) { |
1092 | /* Only if the space blocks everything do we not process - |
1057 | /* Only if the space blocks everything do we not process - |
1093 | * if some form of movemnt is allowed, let objects |
1058 | * if some form of movemnt is allowed, let objects |
1094 | * drop on that space. |
1059 | * drop on that space. |
1095 | */ |
1060 | */ |
1096 | if (free_inventory || ob->map==NULL || ob->map->in_memory!=MAP_IN_MEMORY || |
1061 | if (free_inventory || ob->map==NULL || ob->map->in_memory!=MAP_IN_MEMORY || |
1097 | (GET_MAP_MOVE_BLOCK(ob->map, ob->x, ob->y) == MOVE_ALL)) |
1062 | (GET_MAP_MOVE_BLOCK(ob->map, ob->x, ob->y) == MOVE_ALL)) |
1098 | { |
1063 | { |
1099 | op=ob->inv; |
1064 | op=ob->inv; |
1100 | while(op!=NULL) { |
1065 | while(op!=NULL) { |
1101 | tmp=op->below; |
1066 | tmp=op->below; |
1102 | remove_ob(op); |
1067 | remove_ob(op); |
1103 | free_object2(op, free_inventory); |
1068 | free_object2(op, free_inventory); |
1104 | op=tmp; |
1069 | op=tmp; |
1105 | } |
1070 | } |
1106 | } |
1071 | } |
1107 | else { /* Put objects in inventory onto this space */ |
1072 | else { /* Put objects in inventory onto this space */ |
1108 | op=ob->inv; |
1073 | op=ob->inv; |
1109 | while(op!=NULL) { |
1074 | while(op!=NULL) { |
1110 | tmp=op->below; |
1075 | tmp=op->below; |
1111 | remove_ob(op); |
1076 | remove_ob(op); |
1112 | if(QUERY_FLAG(op,FLAG_STARTEQUIP)||QUERY_FLAG(op,FLAG_NO_DROP) || |
1077 | if(QUERY_FLAG(op,FLAG_STARTEQUIP)||QUERY_FLAG(op,FLAG_NO_DROP) || |
1113 | op->type==RUNE || op->type==TRAP || QUERY_FLAG(op,FLAG_IS_A_TEMPLATE)) |
1078 | op->type==RUNE || op->type==TRAP || QUERY_FLAG(op,FLAG_IS_A_TEMPLATE)) |
1114 | free_object(op); |
1079 | free_object(op); |
1115 | else { |
1080 | else { |
1116 | op->x=ob->x; |
1081 | op->x=ob->x; |
1117 | op->y=ob->y; |
1082 | op->y=ob->y; |
1118 | insert_ob_in_map(op,ob->map,NULL,0); /* Insert in same map as the envir */ |
1083 | insert_ob_in_map(op,ob->map,NULL,0); /* Insert in same map as the envir */ |
1119 | } |
1084 | } |
1120 | op=tmp; |
1085 | op=tmp; |
1121 | } |
1086 | } |
1122 | } |
1087 | } |
1123 | } |
1088 | } |
1124 | /* Remove object from the active list */ |
1089 | /* Remove object from the active list */ |
1125 | ob->speed = 0; |
1090 | ob->speed = 0; |
1126 | update_ob_speed(ob); |
1091 | update_ob_speed(ob); |
1127 | |
1092 | |
1128 | SET_FLAG(ob, FLAG_FREED); |
1093 | SET_FLAG(ob, FLAG_FREED); |
1129 | ob->count = 0; |
1094 | ob->count = 0; |
1130 | |
1095 | |
1131 | /* Remove this object from the list of used objects */ |
1096 | /* Remove this object from the list of used objects */ |
1132 | if(ob->prev==NULL) { |
1097 | if(ob->prev==NULL) { |
1133 | objects=ob->next; |
1098 | objects=ob->next; |
1134 | if(objects!=NULL) |
1099 | if(objects!=NULL) |
1135 | objects->prev=NULL; |
1100 | objects->prev=NULL; |
1136 | } |
1101 | } |
1137 | else { |
1102 | else { |
1138 | ob->prev->next=ob->next; |
1103 | ob->prev->next=ob->next; |
1139 | if(ob->next!=NULL) |
1104 | if(ob->next!=NULL) |
1140 | ob->next->prev=ob->prev; |
1105 | ob->next->prev=ob->prev; |
1141 | } |
1106 | } |
1142 | |
1107 | |
1143 | if(ob->name!=NULL) FREE_AND_CLEAR_STR(ob->name); |
1108 | if(ob->name!=NULL) FREE_AND_CLEAR_STR(ob->name); |
1144 | if(ob->name_pl!=NULL) FREE_AND_CLEAR_STR(ob->name_pl); |
1109 | if(ob->name_pl!=NULL) FREE_AND_CLEAR_STR(ob->name_pl); |
1145 | if(ob->title!=NULL) FREE_AND_CLEAR_STR(ob->title); |
1110 | if(ob->title!=NULL) FREE_AND_CLEAR_STR(ob->title); |
… | |
… | |
1170 | |
1135 | |
1171 | /* Now link it with the free_objects list: */ |
1136 | /* Now link it with the free_objects list: */ |
1172 | ob->prev=NULL; |
1137 | ob->prev=NULL; |
1173 | ob->next=free_objects; |
1138 | ob->next=free_objects; |
1174 | if(free_objects!=NULL) |
1139 | if(free_objects!=NULL) |
1175 | free_objects->prev=ob; |
1140 | free_objects->prev=ob; |
1176 | free_objects=ob; |
1141 | free_objects=ob; |
1177 | nroffreeobjects++; |
1142 | nroffreeobjects++; |
1178 | #endif |
1143 | #endif |
1179 | } |
1144 | } |
1180 | |
1145 | |
… | |
… | |
1246 | mapstruct *m; |
1211 | mapstruct *m; |
1247 | sint16 x,y; |
1212 | sint16 x,y; |
1248 | |
1213 | |
1249 | |
1214 | |
1250 | if(QUERY_FLAG(op,FLAG_REMOVED)) { |
1215 | if(QUERY_FLAG(op,FLAG_REMOVED)) { |
1251 | dump_object(op); |
1216 | dump_object(op); |
1252 | LOG(llevError,"Trying to remove removed object.\n%s\n",errmsg); |
1217 | LOG(llevError,"Trying to remove removed object.\n%s\n",errmsg); |
1253 | |
1218 | |
1254 | /* Changed it to always dump core in this case. As has been learned |
1219 | /* Changed it to always dump core in this case. As has been learned |
1255 | * in the past, trying to recover from errors almost always |
1220 | * in the past, trying to recover from errors almost always |
1256 | * make things worse, and this is a real error here - something |
1221 | * make things worse, and this is a real error here - something |
1257 | * that should not happen. |
1222 | * that should not happen. |
1258 | * Yes, if this was a mission critical app, trying to do something |
1223 | * Yes, if this was a mission critical app, trying to do something |
1259 | * to recover may make sense, but that is because failure of the app |
1224 | * to recover may make sense, but that is because failure of the app |
1260 | * may have other disastrous problems. Cf runs out of a script |
1225 | * may have other disastrous problems. Cf runs out of a script |
1261 | * so is easily enough restarted without any real problems. |
1226 | * so is easily enough restarted without any real problems. |
1262 | * MSW 2001-07-01 |
1227 | * MSW 2001-07-01 |
1263 | */ |
1228 | */ |
1264 | abort(); |
1229 | abort(); |
1265 | } |
1230 | } |
1266 | if(op->more!=NULL) |
1231 | if(op->more!=NULL) |
1267 | remove_ob(op->more); |
1232 | remove_ob(op->more); |
1268 | |
1233 | |
1269 | SET_FLAG(op, FLAG_REMOVED); |
1234 | SET_FLAG(op, FLAG_REMOVED); |
1270 | |
1235 | |
1271 | /* |
1236 | /* |
1272 | * In this case, the object to be removed is in someones |
1237 | * In this case, the object to be removed is in someones |
1273 | * inventory. |
1238 | * inventory. |
1274 | */ |
1239 | */ |
1275 | if(op->env!=NULL) { |
1240 | if(op->env!=NULL) { |
1276 | if(op->nrof) |
1241 | if(op->nrof) |
1277 | sub_weight(op->env, op->weight*op->nrof); |
1242 | sub_weight(op->env, op->weight*op->nrof); |
1278 | else |
1243 | else |
1279 | sub_weight(op->env, op->weight+op->carrying); |
1244 | sub_weight(op->env, op->weight+op->carrying); |
1280 | |
1245 | |
1281 | /* NO_FIX_PLAYER is set when a great many changes are being |
1246 | /* NO_FIX_PLAYER is set when a great many changes are being |
1282 | * made to players inventory. If set, avoiding the call |
1247 | * made to players inventory. If set, avoiding the call |
1283 | * to save cpu time. |
1248 | * to save cpu time. |
1284 | */ |
1249 | */ |
1285 | if ((otmp=is_player_inv(op->env))!=NULL && otmp->contr && |
1250 | if ((otmp=is_player_inv(op->env))!=NULL && otmp->contr && |
1286 | !QUERY_FLAG(otmp,FLAG_NO_FIX_PLAYER)) |
1251 | !QUERY_FLAG(otmp,FLAG_NO_FIX_PLAYER)) |
1287 | fix_player(otmp); |
1252 | fix_player(otmp); |
1288 | |
1253 | |
1289 | if(op->above!=NULL) |
1254 | if(op->above!=NULL) |
1290 | op->above->below=op->below; |
1255 | op->above->below=op->below; |
1291 | else |
1256 | else |
1292 | op->env->inv=op->below; |
1257 | op->env->inv=op->below; |
1293 | |
1258 | |
1294 | if(op->below!=NULL) |
1259 | if(op->below!=NULL) |
1295 | op->below->above=op->above; |
1260 | op->below->above=op->above; |
1296 | |
1261 | |
1297 | /* we set up values so that it could be inserted into |
1262 | /* we set up values so that it could be inserted into |
1298 | * the map, but we don't actually do that - it is up |
1263 | * the map, but we don't actually do that - it is up |
1299 | * to the caller to decide what we want to do. |
1264 | * to the caller to decide what we want to do. |
1300 | */ |
1265 | */ |
1301 | op->x=op->env->x,op->y=op->env->y; |
1266 | op->x=op->env->x,op->y=op->env->y; |
1302 | op->ox=op->x,op->oy=op->y; |
1267 | op->ox=op->x,op->oy=op->y; |
1303 | op->map=op->env->map; |
1268 | op->map=op->env->map; |
1304 | op->above=NULL,op->below=NULL; |
1269 | op->above=NULL,op->below=NULL; |
1305 | op->env=NULL; |
1270 | op->env=NULL; |
1306 | return; |
1271 | return; |
1307 | } |
1272 | } |
1308 | |
1273 | |
1309 | /* If we get here, we are removing it from a map */ |
1274 | /* If we get here, we are removing it from a map */ |
1310 | if (op->map == NULL) return; |
1275 | if (op->map == NULL) return; |
1311 | |
1276 | |
1312 | x = op->x; |
1277 | x = op->x; |
1313 | y = op->y; |
1278 | y = op->y; |
1314 | m = get_map_from_coord(op->map, &x, &y); |
1279 | m = get_map_from_coord(op->map, &x, &y); |
1315 | |
1280 | |
1316 | if (!m) { |
1281 | if (!m) { |
1317 | LOG(llevError,"remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", |
1282 | LOG(llevError,"remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", |
1318 | op->map->path, op->x, op->y); |
1283 | op->map->path, op->x, op->y); |
1319 | /* in old days, we used to set x and y to 0 and continue. |
1284 | /* in old days, we used to set x and y to 0 and continue. |
1320 | * it seems if we get into this case, something is probablye |
1285 | * it seems if we get into this case, something is probablye |
1321 | * screwed up and should be fixed. |
1286 | * screwed up and should be fixed. |
1322 | */ |
1287 | */ |
1323 | abort(); |
1288 | abort(); |
1324 | } |
1289 | } |
1325 | if (op->map != m) { |
1290 | if (op->map != m) { |
1326 | LOG(llevDebug,"remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", |
1291 | LOG(llevDebug,"remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", |
1327 | op->map->path, m->path, op->x, op->y, x, y); |
1292 | op->map->path, m->path, op->x, op->y, x, y); |
1328 | } |
1293 | } |
1329 | |
1294 | |
1330 | /* Re did the following section of code - it looks like it had |
1295 | /* Re did the following section of code - it looks like it had |
1331 | * lots of logic for things we no longer care about |
1296 | * lots of logic for things we no longer care about |
1332 | */ |
1297 | */ |
1333 | |
1298 | |
1334 | /* link the object above us */ |
1299 | /* link the object above us */ |
1335 | if (op->above) |
1300 | if (op->above) |
1336 | op->above->below=op->below; |
1301 | op->above->below=op->below; |
1337 | else |
1302 | else |
1338 | SET_MAP_TOP(m,x,y,op->below); /* we were top, set new top */ |
1303 | SET_MAP_TOP(m,x,y,op->below); /* we were top, set new top */ |
1339 | |
1304 | |
1340 | /* Relink the object below us, if there is one */ |
1305 | /* Relink the object below us, if there is one */ |
1341 | if(op->below) { |
1306 | if(op->below) { |
1342 | op->below->above=op->above; |
1307 | op->below->above=op->above; |
1343 | } else { |
1308 | } else { |
1344 | /* Nothing below, which means we need to relink map object for this space |
1309 | /* Nothing below, which means we need to relink map object for this space |
1345 | * use translated coordinates in case some oddness with map tiling is |
1310 | * use translated coordinates in case some oddness with map tiling is |
1346 | * evident |
1311 | * evident |
1347 | */ |
1312 | */ |
1348 | if(GET_MAP_OB(m,x,y)!=op) { |
1313 | if(GET_MAP_OB(m,x,y)!=op) { |
1349 | dump_object(op); |
1314 | dump_object(op); |
1350 | LOG(llevError,"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg); |
1315 | LOG(llevError,"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg); |
1351 | dump_object(GET_MAP_OB(m,x,y)); |
1316 | dump_object(GET_MAP_OB(m,x,y)); |
1352 | LOG(llevError,"%s\n",errmsg); |
1317 | LOG(llevError,"%s\n",errmsg); |
1353 | } |
1318 | } |
1354 | SET_MAP_OB(m,x,y,op->above); /* goes on above it. */ |
1319 | SET_MAP_OB(m,x,y,op->above); /* goes on above it. */ |
1355 | } |
1320 | } |
1356 | op->above=NULL; |
1321 | op->above=NULL; |
1357 | op->below=NULL; |
1322 | op->below=NULL; |
1358 | |
1323 | |
1359 | if (op->map->in_memory == MAP_SAVING) |
1324 | if (op->map->in_memory == MAP_SAVING) |
1360 | return; |
1325 | return; |
1361 | |
1326 | |
1362 | tag = op->count; |
1327 | tag = op->count; |
1363 | check_walk_off = ! QUERY_FLAG (op, FLAG_NO_APPLY); |
1328 | check_walk_off = ! QUERY_FLAG (op, FLAG_NO_APPLY); |
1364 | for(tmp=GET_MAP_OB(m,x,y);tmp!=NULL;tmp=tmp->above) { |
1329 | for(tmp=GET_MAP_OB(m,x,y);tmp!=NULL;tmp=tmp->above) { |
1365 | /* No point updating the players look faces if he is the object |
1330 | /* No point updating the players look faces if he is the object |
1366 | * being removed. |
1331 | * being removed. |
1367 | */ |
1332 | */ |
1368 | |
1333 | |
1369 | if(tmp->type==PLAYER && tmp!=op) { |
1334 | if(tmp->type==PLAYER && tmp!=op) { |
1370 | /* If a container that the player is currently using somehow gets |
1335 | /* If a container that the player is currently using somehow gets |
1371 | * removed (most likely destroyed), update the player view |
1336 | * removed (most likely destroyed), update the player view |
1372 | * appropriately. |
1337 | * appropriately. |
1373 | */ |
1338 | */ |
1374 | if (tmp->container==op) { |
1339 | if (tmp->container==op) { |
1375 | CLEAR_FLAG(op, FLAG_APPLIED); |
1340 | CLEAR_FLAG(op, FLAG_APPLIED); |
1376 | tmp->container=NULL; |
1341 | tmp->container=NULL; |
1377 | } |
1342 | } |
1378 | tmp->contr->socket.update_look=1; |
1343 | tmp->contr->socket.update_look=1; |
1379 | } |
1344 | } |
1380 | /* See if player moving off should effect something */ |
1345 | /* See if player moving off should effect something */ |
1381 | if (check_walk_off && ((op->move_type & tmp->move_off) && |
1346 | if (check_walk_off && ((op->move_type & tmp->move_off) && |
1382 | (op->move_type & ~tmp->move_off & ~tmp->move_block)==0)) { |
1347 | (op->move_type & ~tmp->move_off & ~tmp->move_block)==0)) { |
1383 | |
1348 | |
1384 | move_apply(tmp, op, NULL); |
1349 | move_apply(tmp, op, NULL); |
1385 | if (was_destroyed (op, tag)) { |
1350 | if (was_destroyed (op, tag)) { |
1386 | LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " |
1351 | LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " |
1387 | "leaving object\n", tmp->name, tmp->arch->name); |
1352 | "leaving object\n", tmp->name, tmp->arch->name); |
1388 | } |
1353 | } |
1389 | } |
1354 | } |
1390 | |
1355 | |
1391 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1356 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1392 | |
1357 | |
1393 | if(tmp->above == tmp) |
1358 | if(tmp->above == tmp) |
1394 | tmp->above = NULL; |
1359 | tmp->above = NULL; |
1395 | last=tmp; |
1360 | last=tmp; |
1396 | } |
1361 | } |
1397 | /* last == NULL of there are no objects on this space */ |
1362 | /* last == NULL of there are no objects on this space */ |
1398 | if (last==NULL) { |
1363 | if (last==NULL) { |
1399 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1364 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1400 | * we could preserve the flags (GET_MAP_FLAGS), but update_position figures |
1365 | * we could preserve the flags (GET_MAP_FLAGS), but update_position figures |
1401 | * those out anyways, and if there are any flags set right now, they won't |
1366 | * those out anyways, and if there are any flags set right now, they won't |
1402 | * be correct anyways. |
1367 | * be correct anyways. |
1403 | */ |
1368 | */ |
1404 | SET_MAP_FLAGS(op->map, op->x, op->y, P_NEED_UPDATE); |
1369 | SET_MAP_FLAGS(op->map, op->x, op->y, P_NEED_UPDATE); |
1405 | update_position(op->map, op->x, op->y); |
1370 | update_position(op->map, op->x, op->y); |
1406 | } |
1371 | } |
1407 | else |
1372 | else |
1408 | update_object(last, UP_OBJ_REMOVE); |
1373 | update_object(last, UP_OBJ_REMOVE); |
1409 | |
1374 | |
1410 | if(QUERY_FLAG(op,FLAG_BLOCKSVIEW)|| (op->glow_radius != 0)) |
1375 | if(QUERY_FLAG(op,FLAG_BLOCKSVIEW)|| (op->glow_radius != 0)) |
1411 | update_all_los(op->map, op->x, op->y); |
1376 | update_all_los(op->map, op->x, op->y); |
1412 | |
1377 | |
1413 | } |
1378 | } |
1414 | |
1379 | |
1415 | /* |
1380 | /* |
1416 | * merge_ob(op,top): |
1381 | * merge_ob(op,top): |
… | |
… | |
1482 | { |
1447 | { |
1483 | object *tmp, *top, *floor=NULL; |
1448 | object *tmp, *top, *floor=NULL; |
1484 | sint16 x,y; |
1449 | sint16 x,y; |
1485 | |
1450 | |
1486 | if (QUERY_FLAG (op, FLAG_FREED)) { |
1451 | if (QUERY_FLAG (op, FLAG_FREED)) { |
1487 | LOG (llevError, "Trying to insert freed object!\n"); |
1452 | LOG (llevError, "Trying to insert freed object!\n"); |
1488 | return NULL; |
1453 | return NULL; |
1489 | } |
1454 | } |
1490 | if(m==NULL) { |
1455 | if(m==NULL) { |
1491 | dump_object(op); |
1456 | dump_object(op); |
1492 | LOG(llevError,"Trying to insert in null-map!\n%s\n",errmsg); |
1457 | LOG(llevError,"Trying to insert in null-map!\n%s\n",errmsg); |
1493 | return op; |
1458 | return op; |
1494 | } |
1459 | } |
1495 | if(out_of_map(m,op->x,op->y)) { |
1460 | if(out_of_map(m,op->x,op->y)) { |
1496 | dump_object(op); |
1461 | dump_object(op); |
1497 | LOG(llevError,"Trying to insert object outside the map.\n%s\n", errmsg); |
1462 | LOG(llevError,"Trying to insert object outside the map.\n%s\n", errmsg); |
1498 | #ifdef MANY_CORES |
1463 | #ifdef MANY_CORES |
1499 | /* Better to catch this here, as otherwise the next use of this object |
1464 | /* Better to catch this here, as otherwise the next use of this object |
1500 | * is likely to cause a crash. Better to find out where it is getting |
1465 | * is likely to cause a crash. Better to find out where it is getting |
1501 | * improperly inserted. |
1466 | * improperly inserted. |
1502 | */ |
1467 | */ |
1503 | abort(); |
1468 | abort(); |
1504 | #endif |
1469 | #endif |
1505 | return op; |
1470 | return op; |
1506 | } |
1471 | } |
1507 | if(!QUERY_FLAG(op,FLAG_REMOVED)) { |
1472 | if(!QUERY_FLAG(op,FLAG_REMOVED)) { |
1508 | dump_object(op); |
1473 | dump_object(op); |
1509 | LOG(llevError,"Trying to insert (map) inserted object.\n%s\n", errmsg); |
1474 | LOG(llevError,"Trying to insert (map) inserted object.\n%s\n", errmsg); |
1510 | return op; |
1475 | return op; |
1511 | } |
1476 | } |
1512 | if(op->more!=NULL) { |
1477 | if(op->more!=NULL) { |
1513 | /* The part may be on a different map. */ |
1478 | /* The part may be on a different map. */ |
1514 | |
1479 | |
1515 | object *more = op->more; |
1480 | object *more = op->more; |
1516 | |
1481 | |
1517 | /* We really need the caller to normalize coordinates - if |
1482 | /* We really need the caller to normalize coordinates - if |
1518 | * we set the map, that doesn't work if the location is within |
1483 | * we set the map, that doesn't work if the location is within |
1519 | * a map and this is straddling an edge. So only if coordinate |
1484 | * a map and this is straddling an edge. So only if coordinate |
1520 | * is clear wrong do we normalize it. |
1485 | * is clear wrong do we normalize it. |
1521 | */ |
1486 | */ |
1522 | if (OUT_OF_REAL_MAP(more->map, more->x, more->y)) { |
1487 | if (OUT_OF_REAL_MAP(more->map, more->x, more->y)) { |
1523 | /* Debugging information so you can see the last coordinates this object had */ |
1488 | /* Debugging information so you can see the last coordinates this object had */ |
1524 | more->ox = more->x; |
1489 | more->ox = more->x; |
1525 | more->oy = more->y; |
1490 | more->oy = more->y; |
1526 | more->map = get_map_from_coord(m, &more->x, &more->y); |
1491 | more->map = get_map_from_coord(m, &more->x, &more->y); |
1527 | } else if (!more->map) { |
1492 | } else if (!more->map) { |
1528 | /* For backwards compatibility - when not dealing with tiled maps, |
1493 | /* For backwards compatibility - when not dealing with tiled maps, |
1529 | * more->map should always point to the parent. |
1494 | * more->map should always point to the parent. |
1530 | */ |
1495 | */ |
1531 | more->map = m; |
1496 | more->map = m; |
1532 | } |
1497 | } |
1533 | |
1498 | |
1534 | if (insert_ob_in_map(more, more->map, originator, flag) == NULL) { |
1499 | if (insert_ob_in_map(more, more->map, originator, flag) == NULL) { |
1535 | if ( ! op->head) |
1500 | if ( ! op->head) |
1536 | LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); |
1501 | LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); |
1537 | return NULL; |
1502 | return NULL; |
1538 | } |
1503 | } |
1539 | } |
1504 | } |
1540 | CLEAR_FLAG(op,FLAG_REMOVED); |
1505 | CLEAR_FLAG(op,FLAG_REMOVED); |
1541 | |
1506 | |
1542 | /* Debugging information so you can see the last coordinates this object had */ |
1507 | /* Debugging information so you can see the last coordinates this object had */ |
1543 | op->ox=op->x; |
1508 | op->ox=op->x; |
… | |
… | |
1552 | y = op->y; |
1517 | y = op->y; |
1553 | |
1518 | |
1554 | /* this has to be done after we translate the coordinates. |
1519 | /* this has to be done after we translate the coordinates. |
1555 | */ |
1520 | */ |
1556 | if(op->nrof && !(flag & INS_NO_MERGE)) { |
1521 | if(op->nrof && !(flag & INS_NO_MERGE)) { |
1557 | for(tmp=GET_MAP_OB(op->map,x,y);tmp!=NULL;tmp=tmp->above) |
1522 | for(tmp=GET_MAP_OB(op->map,x,y);tmp!=NULL;tmp=tmp->above) |
1558 | if (CAN_MERGE(op,tmp)) { |
1523 | if (CAN_MERGE(op,tmp)) { |
1559 | op->nrof+=tmp->nrof; |
1524 | op->nrof+=tmp->nrof; |
1560 | remove_ob(tmp); |
1525 | remove_ob(tmp); |
1561 | free_object(tmp); |
1526 | free_object(tmp); |
1562 | } |
1527 | } |
1563 | } |
1528 | } |
1564 | |
1529 | |
1565 | CLEAR_FLAG(op,FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1530 | CLEAR_FLAG(op,FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1566 | CLEAR_FLAG(op, FLAG_INV_LOCKED); |
1531 | CLEAR_FLAG(op, FLAG_INV_LOCKED); |
1567 | if (!QUERY_FLAG(op, FLAG_ALIVE)) |
1532 | if (!QUERY_FLAG(op, FLAG_ALIVE)) |
1568 | CLEAR_FLAG(op, FLAG_NO_STEAL); |
1533 | CLEAR_FLAG(op, FLAG_NO_STEAL); |
1569 | |
1534 | |
1570 | if (flag & INS_BELOW_ORIGINATOR) { |
1535 | if (flag & INS_BELOW_ORIGINATOR) { |
1571 | if (originator->map != op->map || originator->x != op->x || |
1536 | if (originator->map != op->map || originator->x != op->x || |
1572 | originator->y != op->y) { |
1537 | originator->y != op->y) { |
1573 | LOG(llevError,"insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1538 | LOG(llevError,"insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1574 | abort(); |
1539 | abort(); |
1575 | } |
1540 | } |
1576 | op->above = originator; |
1541 | op->above = originator; |
1577 | op->below = originator->below; |
1542 | op->below = originator->below; |
1578 | if (op->below) op->below->above = op; |
1543 | if (op->below) op->below->above = op; |
1579 | else SET_MAP_OB(op->map, op->x, op->y, op); |
1544 | else SET_MAP_OB(op->map, op->x, op->y, op); |
1580 | /* since *below* originator, no need to update top */ |
1545 | /* since *below* originator, no need to update top */ |
1581 | originator->below = op; |
1546 | originator->below = op; |
1582 | } else { |
1547 | } else { |
1583 | /* If there are other objects, then */ |
1548 | /* If there are other objects, then */ |
1584 | if((! (flag & INS_MAP_LOAD)) && ((top=GET_MAP_OB(op->map,op->x,op->y))!=NULL)) { |
1549 | if((! (flag & INS_MAP_LOAD)) && ((top=GET_MAP_OB(op->map,op->x,op->y))!=NULL)) { |
1585 | object *last=NULL; |
1550 | object *last=NULL; |
1586 | /* |
1551 | /* |
1587 | * If there are multiple objects on this space, we do some trickier handling. |
1552 | * If there are multiple objects on this space, we do some trickier handling. |
1588 | * We've already dealt with merging if appropriate. |
1553 | * We've already dealt with merging if appropriate. |
1589 | * Generally, we want to put the new object on top. But if |
1554 | * Generally, we want to put the new object on top. But if |
1590 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
1555 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
1591 | * floor, we want to insert above that and no further. |
1556 | * floor, we want to insert above that and no further. |
1592 | * Also, if there are spell objects on this space, we stop processing |
1557 | * Also, if there are spell objects on this space, we stop processing |
1593 | * once we get to them. This reduces the need to traverse over all of |
1558 | * once we get to them. This reduces the need to traverse over all of |
1594 | * them when adding another one - this saves quite a bit of cpu time |
1559 | * them when adding another one - this saves quite a bit of cpu time |
1595 | * when lots of spells are cast in one area. Currently, it is presumed |
1560 | * when lots of spells are cast in one area. Currently, it is presumed |
1596 | * that flying non pickable objects are spell objects. |
1561 | * that flying non pickable objects are spell objects. |
1597 | */ |
1562 | */ |
1598 | |
1563 | |
1599 | while (top != NULL) { |
1564 | while (top != NULL) { |
1600 | if (QUERY_FLAG(top, FLAG_IS_FLOOR) || |
1565 | if (QUERY_FLAG(top, FLAG_IS_FLOOR) || |
1601 | QUERY_FLAG(top, FLAG_OVERLAY_FLOOR)) floor = top; |
1566 | QUERY_FLAG(top, FLAG_OVERLAY_FLOOR)) floor = top; |
1602 | if (QUERY_FLAG(top, FLAG_NO_PICK) |
1567 | if (QUERY_FLAG(top, FLAG_NO_PICK) |
1603 | && (top->move_type & (MOVE_FLY_LOW |MOVE_FLY_HIGH)) |
1568 | && (top->move_type & (MOVE_FLY_LOW |MOVE_FLY_HIGH)) |
1604 | && !QUERY_FLAG(top, FLAG_IS_FLOOR)) |
1569 | && !QUERY_FLAG(top, FLAG_IS_FLOOR)) |
1605 | { |
1570 | { |
1606 | /* We insert above top, so we want this object below this */ |
1571 | /* We insert above top, so we want this object below this */ |
1607 | top=top->below; |
1572 | top=top->below; |
1608 | break; |
1573 | break; |
1609 | } |
1574 | } |
1610 | last = top; |
1575 | last = top; |
1611 | top = top->above; |
1576 | top = top->above; |
1612 | } |
1577 | } |
1613 | /* Don't want top to be NULL, so set it to the last valid object */ |
1578 | /* Don't want top to be NULL, so set it to the last valid object */ |
1614 | top = last; |
1579 | top = last; |
1615 | |
1580 | |
1616 | /* We let update_position deal with figuring out what the space |
1581 | /* We let update_position deal with figuring out what the space |
1617 | * looks like instead of lots of conditions here. |
1582 | * looks like instead of lots of conditions here. |
1618 | * makes things faster, and effectively the same result. |
1583 | * makes things faster, and effectively the same result. |
1619 | */ |
1584 | */ |
1620 | |
1585 | |
1621 | /* Have object 'fall below' other objects that block view. |
1586 | /* Have object 'fall below' other objects that block view. |
1622 | * Unless those objects are exits, type 66 |
1587 | * Unless those objects are exits, type 66 |
1623 | * If INS_ON_TOP is used, don't do this processing |
1588 | * If INS_ON_TOP is used, don't do this processing |
1624 | * Need to find the object that in fact blocks view, otherwise |
1589 | * Need to find the object that in fact blocks view, otherwise |
1625 | * stacking is a bit odd. |
1590 | * stacking is a bit odd. |
1626 | */ |
1591 | */ |
1627 | if (!(flag & INS_ON_TOP) && |
1592 | if (!(flag & INS_ON_TOP) && |
1628 | (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && |
1593 | (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && |
1629 | (op->face && !op->face->visibility)) { |
1594 | (op->face && !op->face->visibility)) { |
1630 | for (last=top; last != floor; last=last->below) |
1595 | for (last=top; last != floor; last=last->below) |
1631 | if (QUERY_FLAG(last, FLAG_BLOCKSVIEW)&&(last->type != EXIT)) break; |
1596 | if (QUERY_FLAG(last, FLAG_BLOCKSVIEW)&&(last->type != EXIT)) break; |
1632 | /* Check to see if we found the object that blocks view, |
1597 | /* Check to see if we found the object that blocks view, |
1633 | * and make sure we have a below pointer for it so that |
1598 | * and make sure we have a below pointer for it so that |
1634 | * we can get inserted below this one, which requires we |
1599 | * we can get inserted below this one, which requires we |
1635 | * set top to the object below us. |
1600 | * set top to the object below us. |
1636 | */ |
1601 | */ |
1637 | if (last && last->below && last != floor) top=last->below; |
1602 | if (last && last->below && last != floor) top=last->below; |
1638 | } |
1603 | } |
1639 | } /* If objects on this space */ |
1604 | } /* If objects on this space */ |
1640 | if (flag & INS_MAP_LOAD) |
1605 | if (flag & INS_MAP_LOAD) |
1641 | top = GET_MAP_TOP(op->map,op->x,op->y); |
1606 | top = GET_MAP_TOP(op->map,op->x,op->y); |
1642 | if (flag & INS_ABOVE_FLOOR_ONLY) top = floor; |
1607 | if (flag & INS_ABOVE_FLOOR_ONLY) top = floor; |
1643 | |
1608 | |
1644 | /* Top is the object that our object (op) is going to get inserted above. |
1609 | /* Top is the object that our object (op) is going to get inserted above. |
1645 | */ |
1610 | */ |
1646 | |
1611 | |
1647 | /* First object on this space */ |
1612 | /* First object on this space */ |
1648 | if (!top) { |
1613 | if (!top) { |
1649 | op->above = GET_MAP_OB(op->map, op->x, op->y); |
1614 | op->above = GET_MAP_OB(op->map, op->x, op->y); |
1650 | if (op->above) op->above->below = op; |
1615 | if (op->above) op->above->below = op; |
1651 | op->below = NULL; |
1616 | op->below = NULL; |
1652 | SET_MAP_OB(op->map, op->x, op->y, op); |
1617 | SET_MAP_OB(op->map, op->x, op->y, op); |
1653 | } else { /* get inserted into the stack above top */ |
1618 | } else { /* get inserted into the stack above top */ |
1654 | op->above = top->above; |
1619 | op->above = top->above; |
1655 | if (op->above) op->above->below = op; |
1620 | if (op->above) op->above->below = op; |
1656 | op->below = top; |
1621 | op->below = top; |
1657 | top->above = op; |
1622 | top->above = op; |
1658 | } |
1623 | } |
1659 | if (op->above==NULL) |
1624 | if (op->above==NULL) |
1660 | SET_MAP_TOP(op->map,op->x, op->y, op); |
1625 | SET_MAP_TOP(op->map,op->x, op->y, op); |
1661 | } /* else not INS_BELOW_ORIGINATOR */ |
1626 | } /* else not INS_BELOW_ORIGINATOR */ |
1662 | |
1627 | |
1663 | if(op->type==PLAYER) |
1628 | if(op->type==PLAYER) |
1664 | op->contr->do_los=1; |
1629 | op->contr->do_los=1; |
1665 | |
1630 | |
1666 | /* If we have a floor, we know the player, if any, will be above |
1631 | /* If we have a floor, we know the player, if any, will be above |
1667 | * it, so save a few ticks and start from there. |
1632 | * it, so save a few ticks and start from there. |
1668 | */ |
1633 | */ |
1669 | if (!(flag & INS_MAP_LOAD)) |
1634 | if (!(flag & INS_MAP_LOAD)) |
1670 | for(tmp=floor?floor:GET_MAP_OB(op->map,op->x,op->y);tmp!=NULL;tmp=tmp->above) { |
1635 | for(tmp=floor?floor:GET_MAP_OB(op->map,op->x,op->y);tmp!=NULL;tmp=tmp->above) { |
1671 | if (tmp->type == PLAYER) |
1636 | if (tmp->type == PLAYER) |
1672 | tmp->contr->socket.update_look=1; |
1637 | tmp->contr->socket.update_look=1; |
1673 | } |
1638 | } |
1674 | |
1639 | |
1675 | /* If this object glows, it may affect lighting conditions that are |
1640 | /* If this object glows, it may affect lighting conditions that are |
1676 | * visible to others on this map. But update_all_los is really |
1641 | * visible to others on this map. But update_all_los is really |
1677 | * an inefficient way to do this, as it means los for all players |
1642 | * an inefficient way to do this, as it means los for all players |
… | |
… | |
1680 | * this should get redone to only look for players within range, |
1645 | * this should get redone to only look for players within range, |
1681 | * or just updating the P_NEED_UPDATE for spaces within this area |
1646 | * or just updating the P_NEED_UPDATE for spaces within this area |
1682 | * of effect may be sufficient. |
1647 | * of effect may be sufficient. |
1683 | */ |
1648 | */ |
1684 | if(MAP_DARKNESS(op->map) && (op->glow_radius != 0)) |
1649 | if(MAP_DARKNESS(op->map) && (op->glow_radius != 0)) |
1685 | update_all_los(op->map, op->x, op->y); |
1650 | update_all_los(op->map, op->x, op->y); |
1686 | |
1651 | |
1687 | |
1652 | |
1688 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1653 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1689 | update_object(op,UP_OBJ_INSERT); |
1654 | update_object(op,UP_OBJ_INSERT); |
1690 | |
1655 | |
… | |
… | |
1700 | |
1665 | |
1701 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1666 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1702 | |
1667 | |
1703 | if (!(flag & INS_NO_WALK_ON) && !op->head) { |
1668 | if (!(flag & INS_NO_WALK_ON) && !op->head) { |
1704 | if (check_move_on(op, originator)) |
1669 | if (check_move_on(op, originator)) |
1705 | return NULL; |
1670 | return NULL; |
1706 | |
1671 | |
1707 | /* If we are a multi part object, lets work our way through the check |
1672 | /* If we are a multi part object, lets work our way through the check |
1708 | * walk on's. |
1673 | * walk on's. |
1709 | */ |
1674 | */ |
1710 | for (tmp=op->more; tmp!=NULL; tmp=tmp->more) |
1675 | for (tmp=op->more; tmp!=NULL; tmp=tmp->more) |
1711 | if (check_move_on (tmp, originator)) |
1676 | if (check_move_on (tmp, originator)) |
1712 | return NULL; |
1677 | return NULL; |
1713 | } |
1678 | } |
1714 | return op; |
1679 | return op; |
1715 | } |
1680 | } |
1716 | |
1681 | |
1717 | /* this function inserts an object in the map, but if it |
1682 | /* this function inserts an object in the map, but if it |
… | |
… | |
1723 | object *tmp1; |
1688 | object *tmp1; |
1724 | |
1689 | |
1725 | /* first search for itself and remove any old instances */ |
1690 | /* first search for itself and remove any old instances */ |
1726 | |
1691 | |
1727 | for(tmp=GET_MAP_OB(op->map,op->x,op->y); tmp!=NULL; tmp=tmp->above) { |
1692 | for(tmp=GET_MAP_OB(op->map,op->x,op->y); tmp!=NULL; tmp=tmp->above) { |
1728 | if(!strcmp(tmp->arch->name,arch_string)) /* same archetype */ { |
1693 | if(!strcmp(tmp->arch->name,arch_string)) /* same archetype */ { |
1729 | remove_ob(tmp); |
1694 | remove_ob(tmp); |
1730 | free_object(tmp); |
1695 | free_object(tmp); |
1731 | } |
1696 | } |
1732 | } |
1697 | } |
1733 | |
1698 | |
1734 | tmp1=arch_to_object(find_archetype(arch_string)); |
1699 | tmp1=arch_to_object(find_archetype(arch_string)); |
1735 | |
1700 | |
1736 | |
1701 | |
… | |
… | |
1749 | object *get_split_ob(object *orig_ob, uint32 nr) { |
1714 | object *get_split_ob(object *orig_ob, uint32 nr) { |
1750 | object *newob; |
1715 | object *newob; |
1751 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1716 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1752 | |
1717 | |
1753 | if(orig_ob->nrof<nr) { |
1718 | if(orig_ob->nrof<nr) { |
1754 | sprintf(errmsg,"There are only %d %ss.", |
1719 | sprintf(errmsg,"There are only %d %ss.", |
1755 | orig_ob->nrof?orig_ob->nrof:1, orig_ob->name); |
1720 | orig_ob->nrof?orig_ob->nrof:1, orig_ob->name); |
1756 | return NULL; |
1721 | return NULL; |
1757 | } |
1722 | } |
1758 | newob = object_create_clone(orig_ob); |
1723 | newob = object_create_clone(orig_ob); |
1759 | if((orig_ob->nrof-=nr)<1) { |
1724 | if((orig_ob->nrof-=nr)<1) { |
1760 | if ( ! is_removed) |
1725 | if ( ! is_removed) |
1761 | remove_ob(orig_ob); |
1726 | remove_ob(orig_ob); |
1762 | free_object2(orig_ob, 1); |
1727 | free_object2(orig_ob, 1); |
1763 | } |
1728 | } |
1764 | else if ( ! is_removed) { |
1729 | else if ( ! is_removed) { |
1765 | if(orig_ob->env!=NULL) |
1730 | if(orig_ob->env!=NULL) |
1766 | sub_weight (orig_ob->env,orig_ob->weight*nr); |
1731 | sub_weight (orig_ob->env,orig_ob->weight*nr); |
1767 | if (orig_ob->env == NULL && orig_ob->map->in_memory!=MAP_IN_MEMORY) { |
1732 | if (orig_ob->env == NULL && orig_ob->map->in_memory!=MAP_IN_MEMORY) { |
1768 | strcpy(errmsg, "Tried to split object whose map is not in memory."); |
1733 | strcpy(errmsg, "Tried to split object whose map is not in memory."); |
1769 | LOG(llevDebug, |
1734 | LOG(llevDebug, |
1770 | "Error, Tried to split object whose map is not in memory.\n"); |
1735 | "Error, Tried to split object whose map is not in memory.\n"); |
1771 | return NULL; |
1736 | return NULL; |
1772 | } |
1737 | } |
1773 | } |
1738 | } |
1774 | newob->nrof=nr; |
1739 | newob->nrof=nr; |
1775 | |
1740 | |
1776 | return newob; |
1741 | return newob; |
1777 | } |
1742 | } |
… | |
… | |
1799 | { |
1764 | { |
1800 | op->nrof -= i; |
1765 | op->nrof -= i; |
1801 | } |
1766 | } |
1802 | else if (op->env != NULL) |
1767 | else if (op->env != NULL) |
1803 | { |
1768 | { |
1804 | /* is this object in the players inventory, or sub container |
1769 | /* is this object in the players inventory, or sub container |
1805 | * therein? |
1770 | * therein? |
1806 | */ |
1771 | */ |
1807 | tmp = is_player_inv (op->env); |
1772 | tmp = is_player_inv (op->env); |
1808 | /* nope. Is this a container the player has opened? |
1773 | /* nope. Is this a container the player has opened? |
1809 | * If so, set tmp to that player. |
1774 | * If so, set tmp to that player. |
1810 | * IMO, searching through all the players will mostly |
1775 | * IMO, searching through all the players will mostly |
1811 | * likely be quicker than following op->env to the map, |
1776 | * likely be quicker than following op->env to the map, |
1812 | * and then searching the map for a player. |
1777 | * and then searching the map for a player. |
1813 | */ |
1778 | */ |
1814 | if (!tmp) { |
1779 | if (!tmp) { |
1815 | for (pl=first_player; pl; pl=pl->next) |
1780 | for (pl=first_player; pl; pl=pl->next) |
1816 | if (pl->ob->container == op->env) break; |
1781 | if (pl->ob->container == op->env) break; |
1817 | if (pl) tmp=pl->ob; |
1782 | if (pl) tmp=pl->ob; |
1818 | else tmp=NULL; |
1783 | else tmp=NULL; |
1819 | } |
1784 | } |
1820 | |
1785 | |
1821 | if (i < op->nrof) { |
1786 | if (i < op->nrof) { |
1822 | sub_weight (op->env, op->weight * i); |
1787 | sub_weight (op->env, op->weight * i); |
1823 | op->nrof -= i; |
1788 | op->nrof -= i; |
1824 | if (tmp) { |
1789 | if (tmp) { |
… | |
… | |
1832 | } |
1797 | } |
1833 | } |
1798 | } |
1834 | } |
1799 | } |
1835 | else |
1800 | else |
1836 | { |
1801 | { |
1837 | object *above = op->above; |
1802 | object *above = op->above; |
1838 | |
1803 | |
1839 | if (i < op->nrof) { |
1804 | if (i < op->nrof) { |
1840 | op->nrof -= i; |
1805 | op->nrof -= i; |
1841 | } else { |
1806 | } else { |
1842 | remove_ob (op); |
1807 | remove_ob (op); |
1843 | op->nrof = 0; |
1808 | op->nrof = 0; |
1844 | } |
1809 | } |
1845 | /* Since we just removed op, op->above is null */ |
1810 | /* Since we just removed op, op->above is null */ |
1846 | for (tmp = above; tmp != NULL; tmp = tmp->above) |
1811 | for (tmp = above; tmp != NULL; tmp = tmp->above) |
1847 | if (tmp->type == PLAYER) { |
1812 | if (tmp->type == PLAYER) { |
1848 | if (op->nrof) |
1813 | if (op->nrof) |
1849 | esrv_send_item(tmp, op); |
1814 | esrv_send_item(tmp, op); |
1850 | else |
1815 | else |
… | |
… | |
1902 | LOG(llevError,"Trying to put object in NULL.\n%s\n", errmsg); |
1867 | LOG(llevError,"Trying to put object in NULL.\n%s\n", errmsg); |
1903 | return op; |
1868 | return op; |
1904 | } |
1869 | } |
1905 | if (where->head) { |
1870 | if (where->head) { |
1906 | LOG(llevDebug, |
1871 | LOG(llevDebug, |
1907 | "Warning: Tried to insert object wrong part of multipart object.\n"); |
1872 | "Warning: Tried to insert object wrong part of multipart object.\n"); |
1908 | where = where->head; |
1873 | where = where->head; |
1909 | } |
1874 | } |
1910 | if (op->more) { |
1875 | if (op->more) { |
1911 | LOG(llevError, "Tried to insert multipart object %s (%d)\n", |
1876 | LOG(llevError, "Tried to insert multipart object %s (%d)\n", |
1912 | op->name, op->count); |
1877 | op->name, op->count); |
… | |
… | |
1915 | CLEAR_FLAG(op, FLAG_OBJ_ORIGINAL); |
1880 | CLEAR_FLAG(op, FLAG_OBJ_ORIGINAL); |
1916 | CLEAR_FLAG(op, FLAG_REMOVED); |
1881 | CLEAR_FLAG(op, FLAG_REMOVED); |
1917 | if(op->nrof) { |
1882 | if(op->nrof) { |
1918 | for(tmp=where->inv;tmp!=NULL;tmp=tmp->below) |
1883 | for(tmp=where->inv;tmp!=NULL;tmp=tmp->below) |
1919 | if ( CAN_MERGE(tmp,op) ) { |
1884 | if ( CAN_MERGE(tmp,op) ) { |
1920 | /* return the original object and remove inserted object |
1885 | /* return the original object and remove inserted object |
1921 | (client needs the original object) */ |
1886 | (client needs the original object) */ |
1922 | tmp->nrof += op->nrof; |
1887 | tmp->nrof += op->nrof; |
1923 | /* Weight handling gets pretty funky. Since we are adding to |
1888 | /* Weight handling gets pretty funky. Since we are adding to |
1924 | * tmp->nrof, we need to increase the weight. |
1889 | * tmp->nrof, we need to increase the weight. |
1925 | */ |
1890 | */ |
1926 | add_weight (where, op->weight*op->nrof); |
1891 | add_weight (where, op->weight*op->nrof); |
1927 | SET_FLAG(op, FLAG_REMOVED); |
1892 | SET_FLAG(op, FLAG_REMOVED); |
1928 | free_object(op); /* free the inserted object */ |
1893 | free_object(op); /* free the inserted object */ |
1929 | op = tmp; |
1894 | op = tmp; |
1930 | remove_ob (op); /* and fix old object's links */ |
1895 | remove_ob (op); /* and fix old object's links */ |
1931 | CLEAR_FLAG(op, FLAG_REMOVED); |
1896 | CLEAR_FLAG(op, FLAG_REMOVED); |
1932 | break; |
1897 | break; |
1933 | } |
1898 | } |
1934 | |
1899 | |
1935 | /* I assume combined objects have no inventory |
1900 | /* I assume combined objects have no inventory |
1936 | * We add the weight - this object could have just been removed |
1901 | * We add the weight - this object could have just been removed |
1937 | * (if it was possible to merge). calling remove_ob will subtract |
1902 | * (if it was possible to merge). calling remove_ob will subtract |
… | |
… | |
1958 | /* reset the light list and los of the players on the map */ |
1923 | /* reset the light list and los of the players on the map */ |
1959 | if((op->glow_radius!=0)&&where->map) |
1924 | if((op->glow_radius!=0)&&where->map) |
1960 | { |
1925 | { |
1961 | #ifdef DEBUG_LIGHTS |
1926 | #ifdef DEBUG_LIGHTS |
1962 | LOG(llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", |
1927 | LOG(llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", |
1963 | op->name); |
1928 | op->name); |
1964 | #endif /* DEBUG_LIGHTS */ |
1929 | #endif /* DEBUG_LIGHTS */ |
1965 | if (MAP_DARKNESS(where->map)) update_all_los(where->map, where->x, where->y); |
1930 | if (MAP_DARKNESS(where->map)) update_all_los(where->map, where->x, where->y); |
1966 | } |
1931 | } |
1967 | |
1932 | |
1968 | /* Client has no idea of ordering so lets not bother ordering it here. |
1933 | /* Client has no idea of ordering so lets not bother ordering it here. |
… | |
… | |
2006 | mapstruct *m=op->map; |
1971 | mapstruct *m=op->map; |
2007 | int x=op->x, y=op->y; |
1972 | int x=op->x, y=op->y; |
2008 | MoveType move_on, move_slow, move_block; |
1973 | MoveType move_on, move_slow, move_block; |
2009 | |
1974 | |
2010 | if(QUERY_FLAG(op,FLAG_NO_APPLY)) |
1975 | if(QUERY_FLAG(op,FLAG_NO_APPLY)) |
2011 | return 0; |
1976 | return 0; |
2012 | |
1977 | |
2013 | tag = op->count; |
1978 | tag = op->count; |
2014 | |
1979 | |
2015 | move_on = GET_MAP_MOVE_ON(op->map, op->x, op->y); |
1980 | move_on = GET_MAP_MOVE_ON(op->map, op->x, op->y); |
2016 | move_slow = GET_MAP_MOVE_SLOW(op->map, op->x, op->y); |
1981 | move_slow = GET_MAP_MOVE_SLOW(op->map, op->x, op->y); |
… | |
… | |
2020 | * no need to do checking below. have to make sure move_type |
1985 | * no need to do checking below. have to make sure move_type |
2021 | * is set, as lots of objects don't have it set - we treat that |
1986 | * is set, as lots of objects don't have it set - we treat that |
2022 | * as walking. |
1987 | * as walking. |
2023 | */ |
1988 | */ |
2024 | if (op->move_type && !(op->move_type & move_on) && !(op->move_type & move_slow)) |
1989 | if (op->move_type && !(op->move_type & move_on) && !(op->move_type & move_slow)) |
2025 | return 0; |
1990 | return 0; |
2026 | |
1991 | |
2027 | /* This is basically inverse logic of that below - basically, |
1992 | /* This is basically inverse logic of that below - basically, |
2028 | * if the object can avoid the move on or slow move, they do so, |
1993 | * if the object can avoid the move on or slow move, they do so, |
2029 | * but can't do it if the alternate movement they are using is |
1994 | * but can't do it if the alternate movement they are using is |
2030 | * blocked. Logic on this seems confusing, but does seem correct. |
1995 | * blocked. Logic on this seems confusing, but does seem correct. |
2031 | */ |
1996 | */ |
2032 | if ((op->move_type & ~move_on & ~move_block) != 0 && |
1997 | if ((op->move_type & ~move_on & ~move_block) != 0 && |
2033 | (op->move_type & ~move_slow & ~move_block) != 0) return 0; |
1998 | (op->move_type & ~move_slow & ~move_block) != 0) return 0; |
2034 | |
1999 | |
2035 | /* The objects have to be checked from top to bottom. |
2000 | /* The objects have to be checked from top to bottom. |
2036 | * Hence, we first go to the top: |
2001 | * Hence, we first go to the top: |
2037 | */ |
2002 | */ |
2038 | |
2003 | |
2039 | for (tmp=GET_MAP_OB(op->map, op->x, op->y); tmp!=NULL && |
2004 | for (tmp=GET_MAP_OB(op->map, op->x, op->y); tmp!=NULL && |
2040 | tmp->above!=NULL; tmp=tmp->above) { |
2005 | tmp->above!=NULL; tmp=tmp->above) { |
2041 | /* Trim the search when we find the first other spell effect |
2006 | /* Trim the search when we find the first other spell effect |
2042 | * this helps performance so that if a space has 50 spell objects, |
2007 | * this helps performance so that if a space has 50 spell objects, |
2043 | * we don't need to check all of them. |
2008 | * we don't need to check all of them. |
2044 | */ |
2009 | */ |
2045 | if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG(tmp, FLAG_NO_PICK)) break; |
2010 | if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG(tmp, FLAG_NO_PICK)) break; |
2046 | } |
2011 | } |
2047 | for(;tmp!=NULL; tmp=tmp->below) { |
2012 | for(;tmp!=NULL; tmp=tmp->below) { |
2048 | if (tmp == op) continue; /* Can't apply yourself */ |
2013 | if (tmp == op) continue; /* Can't apply yourself */ |
2049 | |
2014 | |
2050 | /* Check to see if one of the movement types should be slowed down. |
2015 | /* Check to see if one of the movement types should be slowed down. |
2051 | * Second check makes sure that the movement types not being slowed |
2016 | * Second check makes sure that the movement types not being slowed |
2052 | * (~slow_move) is not blocked on this space - just because the |
2017 | * (~slow_move) is not blocked on this space - just because the |
2053 | * space doesn't slow down swimming (for example), if you can't actually |
2018 | * space doesn't slow down swimming (for example), if you can't actually |
2054 | * swim on that space, can't use it to avoid the penalty. |
2019 | * swim on that space, can't use it to avoid the penalty. |
2055 | */ |
2020 | */ |
2056 | if (!QUERY_FLAG(op, FLAG_WIZPASS)) { |
2021 | if (!QUERY_FLAG(op, FLAG_WIZPASS)) { |
2057 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
2022 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
2058 | ((op->move_type & tmp->move_slow) && |
2023 | ((op->move_type & tmp->move_slow) && |
2059 | (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) { |
2024 | (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) { |
2060 | |
2025 | |
2061 | float diff; |
2026 | float diff; |
2062 | |
2027 | |
2063 | diff = tmp->move_slow_penalty*FABS(op->speed); |
2028 | diff = tmp->move_slow_penalty*FABS(op->speed); |
2064 | if (op->type == PLAYER) { |
2029 | if (op->type == PLAYER) { |
2065 | if ((QUERY_FLAG(tmp, FLAG_IS_HILLY) && find_skill_by_number(op, SK_CLIMBING)) || |
2030 | if ((QUERY_FLAG(tmp, FLAG_IS_HILLY) && find_skill_by_number(op, SK_CLIMBING)) || |
2066 | (QUERY_FLAG(tmp, FLAG_IS_WOODED) && find_skill_by_number(op, SK_WOODSMAN))) { |
2031 | (QUERY_FLAG(tmp, FLAG_IS_WOODED) && find_skill_by_number(op, SK_WOODSMAN))) { |
2067 | diff /= 4.0; |
2032 | diff /= 4.0; |
2068 | } |
2033 | } |
2069 | } |
2034 | } |
2070 | op->speed_left -= diff; |
2035 | op->speed_left -= diff; |
2071 | } |
2036 | } |
2072 | } |
2037 | } |
2073 | |
2038 | |
2074 | /* Basically same logic as above, except now for actual apply. */ |
2039 | /* Basically same logic as above, except now for actual apply. */ |
2075 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
2040 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
2076 | ((op->move_type & tmp->move_on) && |
2041 | ((op->move_type & tmp->move_on) && |
2077 | (op->move_type & ~tmp->move_on & ~tmp->move_block)==0)) { |
2042 | (op->move_type & ~tmp->move_on & ~tmp->move_block)==0)) { |
2078 | |
2043 | |
2079 | move_apply(tmp, op, originator); |
2044 | move_apply(tmp, op, originator); |
2080 | if (was_destroyed (op, tag)) |
2045 | if (was_destroyed (op, tag)) |
2081 | return 1; |
2046 | return 1; |
2082 | |
2047 | |
2083 | /* what the person/creature stepped onto has moved the object |
2048 | /* what the person/creature stepped onto has moved the object |
2084 | * someplace new. Don't process any further - if we did, |
2049 | * someplace new. Don't process any further - if we did, |
2085 | * have a feeling strange problems would result. |
2050 | * have a feeling strange problems would result. |
2086 | */ |
2051 | */ |
2087 | if (op->map != m || op->x != x || op->y != y) return 0; |
2052 | if (op->map != m || op->x != x || op->y != y) return 0; |
2088 | } |
2053 | } |
2089 | } |
2054 | } |
2090 | return 0; |
2055 | return 0; |
2091 | } |
2056 | } |
2092 | |
2057 | |
2093 | /* |
2058 | /* |
… | |
… | |
2157 | |
2122 | |
2158 | object *present_in_ob_by_name(int type, const char *str, const object *op) { |
2123 | object *present_in_ob_by_name(int type, const char *str, const object *op) { |
2159 | object *tmp; |
2124 | object *tmp; |
2160 | |
2125 | |
2161 | for(tmp=op->inv; tmp!=NULL; tmp=tmp->below) { |
2126 | for(tmp=op->inv; tmp!=NULL; tmp=tmp->below) { |
2162 | if ((type==-1 || tmp->type==type) && (!strcmp(str, tmp->name))) |
2127 | if ((type==-1 || tmp->type==type) && (!strcmp(str, tmp->name))) |
2163 | return tmp; |
2128 | return tmp; |
2164 | } |
2129 | } |
2165 | return NULL; |
2130 | return NULL; |
2166 | } |
2131 | } |
2167 | |
2132 | |
2168 | /* |
2133 | /* |
… | |
… | |
2238 | int find_free_spot(const object *ob, mapstruct *m,int x,int y,int start,int stop) { |
2203 | int find_free_spot(const object *ob, mapstruct *m,int x,int y,int start,int stop) { |
2239 | int i,index=0, flag; |
2204 | int i,index=0, flag; |
2240 | static int altern[SIZEOFFREE]; |
2205 | static int altern[SIZEOFFREE]; |
2241 | |
2206 | |
2242 | for(i=start;i<stop;i++) { |
2207 | for(i=start;i<stop;i++) { |
2243 | flag = ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i]); |
2208 | flag = ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i]); |
2244 | if(!flag) |
2209 | if(!flag) |
2245 | altern[index++]=i; |
2210 | altern[index++]=i; |
2246 | |
2211 | |
2247 | /* Basically, if we find a wall on a space, we cut down the search size. |
2212 | /* Basically, if we find a wall on a space, we cut down the search size. |
2248 | * In this way, we won't return spaces that are on another side of a wall. |
2213 | * In this way, we won't return spaces that are on another side of a wall. |
2249 | * This mostly work, but it cuts down the search size in all directions - |
2214 | * This mostly work, but it cuts down the search size in all directions - |
2250 | * if the space being examined only has a wall to the north and empty |
2215 | * if the space being examined only has a wall to the north and empty |
2251 | * spaces in all the other directions, this will reduce the search space |
2216 | * spaces in all the other directions, this will reduce the search space |
2252 | * to only the spaces immediately surrounding the target area, and |
2217 | * to only the spaces immediately surrounding the target area, and |
2253 | * won't look 2 spaces south of the target space. |
2218 | * won't look 2 spaces south of the target space. |
2254 | */ |
2219 | */ |
2255 | else if ((flag & AB_NO_PASS) && maxfree[i]<stop) |
2220 | else if ((flag & AB_NO_PASS) && maxfree[i]<stop) |
2256 | stop=maxfree[i]; |
2221 | stop=maxfree[i]; |
2257 | } |
2222 | } |
2258 | if(!index) return -1; |
2223 | if(!index) return -1; |
2259 | return altern[RANDOM()%index]; |
2224 | return altern[RANDOM()%index]; |
2260 | } |
2225 | } |
2261 | |
2226 | |
… | |
… | |
2267 | */ |
2232 | */ |
2268 | |
2233 | |
2269 | int find_first_free_spot(const object *ob, mapstruct *m,int x,int y) { |
2234 | int find_first_free_spot(const object *ob, mapstruct *m,int x,int y) { |
2270 | int i; |
2235 | int i; |
2271 | for(i=0;i<SIZEOFFREE;i++) { |
2236 | for(i=0;i<SIZEOFFREE;i++) { |
2272 | if(!ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i])) |
2237 | if(!ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i])) |
2273 | return i; |
2238 | return i; |
2274 | } |
2239 | } |
2275 | return -1; |
2240 | return -1; |
2276 | } |
2241 | } |
2277 | |
2242 | |
2278 | /* |
2243 | /* |
… | |
… | |
2284 | int i, j, tmp, len; |
2249 | int i, j, tmp, len; |
2285 | |
2250 | |
2286 | len = end-begin; |
2251 | len = end-begin; |
2287 | for(i = begin; i < end; i++) |
2252 | for(i = begin; i < end; i++) |
2288 | { |
2253 | { |
2289 | j = begin+RANDOM()%len; |
2254 | j = begin+RANDOM()%len; |
2290 | |
2255 | |
2291 | tmp = arr[i]; |
2256 | tmp = arr[i]; |
2292 | arr[i] = arr[j]; |
2257 | arr[i] = arr[j]; |
2293 | arr[j] = tmp; |
2258 | arr[j] = tmp; |
2294 | } |
2259 | } |
2295 | } |
2260 | } |
2296 | |
2261 | |
2297 | /* new function to make monster searching more efficient, and effective! |
2262 | /* new function to make monster searching more efficient, and effective! |
2298 | * This basically returns a randomized array (in the passed pointer) of |
2263 | * This basically returns a randomized array (in the passed pointer) of |
… | |
… | |
2305 | { |
2270 | { |
2306 | int i; |
2271 | int i; |
2307 | |
2272 | |
2308 | for(i = 0; i < SIZEOFFREE; i++) |
2273 | for(i = 0; i < SIZEOFFREE; i++) |
2309 | { |
2274 | { |
2310 | search_arr[i] = i; |
2275 | search_arr[i] = i; |
2311 | } |
2276 | } |
2312 | |
2277 | |
2313 | permute(search_arr, 1, SIZEOFFREE1+1); |
2278 | permute(search_arr, 1, SIZEOFFREE1+1); |
2314 | permute(search_arr, SIZEOFFREE1+1, SIZEOFFREE2+1); |
2279 | permute(search_arr, SIZEOFFREE1+1, SIZEOFFREE2+1); |
2315 | permute(search_arr, SIZEOFFREE2+1, SIZEOFFREE); |
2280 | permute(search_arr, SIZEOFFREE2+1, SIZEOFFREE); |
… | |
… | |
2334 | object *tmp; |
2299 | object *tmp; |
2335 | mapstruct *mp; |
2300 | mapstruct *mp; |
2336 | MoveType blocked, move_type; |
2301 | MoveType blocked, move_type; |
2337 | |
2302 | |
2338 | if (exclude && exclude->head) { |
2303 | if (exclude && exclude->head) { |
2339 | exclude = exclude->head; |
2304 | exclude = exclude->head; |
2340 | move_type = exclude->move_type; |
2305 | move_type = exclude->move_type; |
2341 | } else { |
2306 | } else { |
2342 | /* If we don't have anything, presume it can use all movement types. */ |
2307 | /* If we don't have anything, presume it can use all movement types. */ |
2343 | move_type=MOVE_ALL; |
2308 | move_type=MOVE_ALL; |
2344 | } |
2309 | } |
2345 | |
2310 | |
2346 | for(i=1;i<max;i++) { |
2311 | for(i=1;i<max;i++) { |
2347 | mp = m; |
2312 | mp = m; |
2348 | nx = x + freearr_x[i]; |
2313 | nx = x + freearr_x[i]; |
2349 | ny = y + freearr_y[i]; |
2314 | ny = y + freearr_y[i]; |
2350 | |
2315 | |
2351 | mflags = get_map_flags(m, &mp, nx, ny, &nx, &ny); |
2316 | mflags = get_map_flags(m, &mp, nx, ny, &nx, &ny); |
2352 | if (mflags & P_OUT_OF_MAP) { |
2317 | if (mflags & P_OUT_OF_MAP) { |
2353 | max = maxfree[i]; |
2318 | max = maxfree[i]; |
2354 | } else { |
2319 | } else { |
2355 | blocked = GET_MAP_MOVE_BLOCK(mp, nx, ny); |
2320 | blocked = GET_MAP_MOVE_BLOCK(mp, nx, ny); |
2356 | |
2321 | |
2357 | if ((move_type & blocked) == move_type) { |
2322 | if ((move_type & blocked) == move_type) { |
2358 | max=maxfree[i]; |
2323 | max=maxfree[i]; |
2359 | } else if (mflags & P_IS_ALIVE) { |
2324 | } else if (mflags & P_IS_ALIVE) { |
2360 | for (tmp=GET_MAP_OB(mp,nx,ny); tmp!= NULL; tmp=tmp->above) { |
2325 | for (tmp=GET_MAP_OB(mp,nx,ny); tmp!= NULL; tmp=tmp->above) { |
2361 | if ((QUERY_FLAG(tmp,FLAG_MONSTER) || tmp->type==PLAYER) && |
2326 | if ((QUERY_FLAG(tmp,FLAG_MONSTER) || tmp->type==PLAYER) && |
2362 | (tmp != exclude ||(tmp->head && tmp->head != exclude))) { |
2327 | (tmp != exclude ||(tmp->head && tmp->head != exclude))) { |
2363 | break; |
2328 | break; |
2364 | } |
2329 | } |
2365 | } |
2330 | } |
2366 | if(tmp) { |
2331 | if(tmp) { |
2367 | return freedir[i]; |
2332 | return freedir[i]; |
2368 | } |
2333 | } |
2369 | } |
2334 | } |
2370 | } |
2335 | } |
2371 | } |
2336 | } |
2372 | return 0; |
2337 | return 0; |
2373 | } |
2338 | } |
2374 | |
2339 | |
2375 | /* |
2340 | /* |
… | |
… | |
2539 | if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW)) return 0; |
2504 | if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW)) return 0; |
2540 | |
2505 | |
2541 | /* yes, can see. */ |
2506 | /* yes, can see. */ |
2542 | if(dir < 9) return 1; |
2507 | if(dir < 9) return 1; |
2543 | return can_see_monsterP(m, x, y, reduction_dir[dir][0]) | |
2508 | return can_see_monsterP(m, x, y, reduction_dir[dir][0]) | |
2544 | can_see_monsterP(m,x,y, reduction_dir[dir][1]) | |
2509 | can_see_monsterP(m,x,y, reduction_dir[dir][1]) | |
2545 | can_see_monsterP(m,x,y, reduction_dir[dir][2]); |
2510 | can_see_monsterP(m,x,y, reduction_dir[dir][2]); |
2546 | } |
2511 | } |
2547 | |
2512 | |
2548 | |
2513 | |
2549 | |
2514 | |
2550 | /* |
2515 | /* |
2551 | * can_pick(picker, item): finds out if an object is possible to be |
2516 | * can_pick(picker, item): finds out if an object is possible to be |
2552 | * picked up by the picker. Returnes 1 if it can be |
2517 | * picked up by the picker. Returnes 1 if it can be |
2553 | * picked up, otherwise 0. |
2518 | * picked up, otherwise 0. |
2554 | * |
2519 | * |
… | |
… | |
2559 | */ |
2524 | */ |
2560 | |
2525 | |
2561 | int can_pick(const object *who, const object *item) { |
2526 | int can_pick(const object *who, const object *item) { |
2562 | return /*QUERY_FLAG(who,FLAG_WIZ)||*/ |
2527 | return /*QUERY_FLAG(who,FLAG_WIZ)||*/ |
2563 | (item->weight>0&&!QUERY_FLAG(item,FLAG_NO_PICK)&& |
2528 | (item->weight>0&&!QUERY_FLAG(item,FLAG_NO_PICK)&& |
2564 | !QUERY_FLAG(item,FLAG_ALIVE)&&!item->invisible && |
2529 | !QUERY_FLAG(item,FLAG_ALIVE)&&!item->invisible && |
2565 | (who->type==PLAYER||item->weight<who->weight/3)); |
2530 | (who->type==PLAYER||item->weight<who->weight/3)); |
2566 | } |
2531 | } |
2567 | |
2532 | |
2568 | |
2533 | |
2569 | /* |
2534 | /* |
… | |
… | |
2594 | prev->more = tmp; |
2559 | prev->more = tmp; |
2595 | prev = tmp; |
2560 | prev = tmp; |
2596 | } |
2561 | } |
2597 | /*** copy inventory ***/ |
2562 | /*** copy inventory ***/ |
2598 | for(item = src->inv; item; item = item->below) { |
2563 | for(item = src->inv; item; item = item->below) { |
2599 | (void) insert_ob_in_ob(object_create_clone(item),dst); |
2564 | (void) insert_ob_in_ob(object_create_clone(item),dst); |
2600 | } |
2565 | } |
2601 | |
2566 | |
2602 | return dst; |
2567 | return dst; |
2603 | } |
2568 | } |
2604 | |
2569 | |
… | |
… | |
2618 | /* Also remember that multiparts objects are not supported for now. */ |
2583 | /* Also remember that multiparts objects are not supported for now. */ |
2619 | |
2584 | |
2620 | object* load_object_str(const char *obstr) |
2585 | object* load_object_str(const char *obstr) |
2621 | { |
2586 | { |
2622 | object *op; |
2587 | object *op; |
2623 | FILE *tempfile; |
|
|
2624 | char filename[MAX_BUF]; |
2588 | char filename[MAX_BUF]; |
2625 | sprintf(filename,"%s/cfloadobstr2044",settings.tmpdir); |
2589 | sprintf(filename,"%s/cfloadobstr2044",settings.tmpdir); |
|
|
2590 | |
2626 | tempfile=fopen(filename,"w"); |
2591 | FILE *tempfile=fopen(filename,"w"); |
2627 | if (tempfile == NULL) |
2592 | if (tempfile == NULL) |
2628 | { |
2593 | { |
2629 | LOG(llevError,"Error - Unable to access load object temp file\n"); |
2594 | LOG(llevError,"Error - Unable to access load object temp file\n"); |
2630 | return NULL; |
2595 | return NULL; |
2631 | }; |
2596 | }; |
2632 | fprintf(tempfile,obstr); |
2597 | fprintf(tempfile,obstr); |
2633 | fclose(tempfile); |
2598 | fclose(tempfile); |
2634 | |
2599 | |
2635 | op=get_object(); |
2600 | op=get_object(); |
2636 | |
2601 | |
2637 | tempfile=fopen(filename,"r"); |
2602 | object_thawer thawer (filename); |
2638 | if (tempfile == NULL) |
2603 | if (thawer) |
2639 | { |
|
|
2640 | LOG(llevError,"Error - Unable to read object temp file\n"); |
|
|
2641 | return NULL; |
|
|
2642 | }; |
|
|
2643 | load_object(tempfile,op,LO_NEWFILE,0); |
2604 | load_object(thawer,op,LO_NEWFILE,0); |
2644 | LOG(llevDebug," load str completed, object=%s\n",op->name); |
2605 | LOG(llevDebug," load str completed, object=%s\n",op->name); |
2645 | CLEAR_FLAG(op,FLAG_REMOVED); |
2606 | CLEAR_FLAG(op,FLAG_REMOVED); |
2646 | fclose(tempfile); |
2607 | |
2647 | return op; |
2608 | return op; |
2648 | } |
2609 | } |
2649 | |
2610 | |
2650 | /* This returns the first object in who's inventory that |
2611 | /* This returns the first object in who's inventory that |
2651 | * has the same type and subtype match. |
2612 | * has the same type and subtype match. |
… | |
… | |
2654 | object *find_obj_by_type_subtype(const object *who, int type, int subtype) |
2615 | object *find_obj_by_type_subtype(const object *who, int type, int subtype) |
2655 | { |
2616 | { |
2656 | object *tmp; |
2617 | object *tmp; |
2657 | |
2618 | |
2658 | for (tmp=who->inv; tmp; tmp=tmp->below) |
2619 | for (tmp=who->inv; tmp; tmp=tmp->below) |
2659 | if (tmp->type == type && tmp->subtype == subtype) return tmp; |
2620 | if (tmp->type == type && tmp->subtype == subtype) return tmp; |
2660 | |
2621 | |
2661 | return NULL; |
2622 | return NULL; |
2662 | } |
2623 | } |
2663 | |
2624 | |
2664 | /* If ob has a field named key, return the link from the list, |
2625 | /* If ob has a field named key, return the link from the list, |
… | |
… | |
2725 | */ |
2686 | */ |
2726 | int set_ob_key_value_s(object * op, const char * canonical_key, const char * value, int add_key) { |
2687 | int set_ob_key_value_s(object * op, const char * canonical_key, const char * value, int add_key) { |
2727 | key_value * field = NULL, *last=NULL; |
2688 | key_value * field = NULL, *last=NULL; |
2728 | |
2689 | |
2729 | for (field=op->key_values; field != NULL; field=field->next) { |
2690 | for (field=op->key_values; field != NULL; field=field->next) { |
2730 | if (field->key != canonical_key) { |
2691 | if (field->key != canonical_key) { |
2731 | last = field; |
2692 | last = field; |
2732 | continue; |
2693 | continue; |
2733 | } |
2694 | } |
2734 | |
2695 | |
2735 | if (field->value) FREE_AND_CLEAR_STR(field->value); |
2696 | if (field->value) FREE_AND_CLEAR_STR(field->value); |
2736 | if (value) |
2697 | if (value) |
2737 | field->value = add_string(value); |
2698 | field->value = add_string(value); |
2738 | else { |
2699 | else { |
2739 | /* Basically, if the archetype has this key set, |
2700 | /* Basically, if the archetype has this key set, |
2740 | * we need to store the null value so when we save |
2701 | * we need to store the null value so when we save |
2741 | * it, we save the empty value so that when we load, |
2702 | * it, we save the empty value so that when we load, |
2742 | * we get this value back again. |
2703 | * we get this value back again. |
2743 | */ |
2704 | */ |
2744 | if (get_ob_key_link(&op->arch->clone, canonical_key)) |
2705 | if (get_ob_key_link(&op->arch->clone, canonical_key)) |
2745 | field->value = NULL; |
2706 | field->value = NULL; |
2746 | else { |
2707 | else { |
2747 | /* Delete this link */ |
2708 | /* Delete this link */ |
2748 | if (field->key) FREE_AND_CLEAR_STR(field->key); |
2709 | if (field->key) FREE_AND_CLEAR_STR(field->key); |
2749 | if (field->value) FREE_AND_CLEAR_STR(field->value); |
2710 | if (field->value) FREE_AND_CLEAR_STR(field->value); |
2750 | if (last) last->next = field->next; |
2711 | if (last) last->next = field->next; |
2751 | else op->key_values = field->next; |
2712 | else op->key_values = field->next; |
2752 | free(field); |
2713 | free(field); |
2753 | } |
2714 | } |
2754 | } |
2715 | } |
2755 | return TRUE; |
2716 | return TRUE; |
2756 | } |
2717 | } |
2757 | /* IF we get here, key doesn't exist */ |
2718 | /* IF we get here, key doesn't exist */ |
2758 | |
2719 | |
2759 | /* No field, we'll have to add it. */ |
2720 | /* No field, we'll have to add it. */ |