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