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