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