|
|
1 | |
1 | /* |
2 | /* |
2 | * static char *rcsid_object_c = |
3 | * static char *rcsid_object_c = |
3 | * "$Id: object.C,v 1.3 2006/08/26 08:44:05 root Exp $"; |
4 | * "$Id: object.C,v 1.26 2006/09/11 11:46:52 root Exp $"; |
4 | */ |
5 | */ |
5 | |
6 | |
6 | /* |
7 | /* |
7 | CrossFire, A Multiplayer game for X-windows |
8 | CrossFire, A Multiplayer game for X-windows |
8 | |
9 | |
… | |
… | |
28 | |
29 | |
29 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
30 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
30 | sub/add_weight will transcend the environment updating the carrying |
31 | sub/add_weight will transcend the environment updating the carrying |
31 | variable. */ |
32 | variable. */ |
32 | #include <global.h> |
33 | #include <global.h> |
33 | #ifndef WIN32 /* ---win32 exclude headers */ |
34 | #ifndef WIN32 /* ---win32 exclude headers */ |
34 | #include <stdio.h> |
35 | # include <stdio.h> |
35 | #include <sys/types.h> |
36 | # include <sys/types.h> |
36 | #include <sys/uio.h> |
37 | # include <sys/uio.h> |
37 | #endif /* win32 */ |
38 | #endif /* win32 */ |
38 | #include <object.h> |
39 | #include <object.h> |
39 | #include <funcpoint.h> |
40 | #include <funcpoint.h> |
40 | #include <skills.h> |
41 | #include <skills.h> |
41 | #include <loader.h> |
42 | #include <loader.h> |
42 | #ifdef MEMORY_DEBUG |
|
|
43 | int nroffreeobjects = 0; |
|
|
44 | int nrofallocobjects = 0; |
43 | 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 | |
44 | |
53 | object *objects; /* Pointer to the list of used objects */ |
45 | 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 */ |
46 | object *active_objects; /* List of active objects that need to be processed */ |
56 | |
47 | |
57 | short freearr_x[SIZEOFFREE]= |
48 | short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
58 | {0,0,1,1,1,0,-1,-1,-1,0,1,2,2,2,2,2,1,0,-1,-2,-2,-2,-2,-2,-1, |
|
|
59 | 0,1,2,3,3,3,3,3,3,3,2,1,0,-1,-2,-3,-3,-3,-3,-3,-3,-3,-2,-1}; |
49 | 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 |
60 | short freearr_y[SIZEOFFREE]= |
50 | }; |
61 | {0,-1,-1,0,1,1,1,0,-1,-2,-2,-2,-1,0,1,2,2,2,2,2,1,0,-1,-2,-2, |
51 | short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, |
62 | -3,-3,-3,-3,-2,-1,0,1,2,3,3,3,3,3,3,3,2,1,0,-1,-2,-3,-3,-3}; |
52 | -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 |
63 | int maxfree[SIZEOFFREE]= |
53 | }; |
64 | {0,9,10,13,14,17,18,21,22,25,26,27,30,31,32,33,36,37,39,39,42,43,44,45, |
54 | int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, |
65 | 48,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49}; |
55 | 48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 |
|
|
56 | }; |
66 | int freedir[SIZEOFFREE]= { |
57 | int freedir[SIZEOFFREE] = { |
67 | 0,1,2,3,4,5,6,7,8,1,2,2,2,3,4,4,4,5,6,6,6,7,8,8,8, |
58 | 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, |
68 | 1,2,2,2,2,2,3,4,4,4,4,4,5,6,6,6,6,6,7,8,8,8,8,8}; |
59 | 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 |
69 | |
60 | }; |
70 | |
61 | |
71 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
62 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
|
|
63 | static int |
72 | static int compare_ob_value_lists_one(const object * wants, const object * has) { |
64 | compare_ob_value_lists_one (const object *wants, const object *has) |
|
|
65 | { |
73 | key_value * wants_field; |
66 | key_value *wants_field; |
74 | |
67 | |
75 | /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both |
68 | /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both |
76 | * objects with lists are rare, and lists stay short. If not, use a |
69 | * objects with lists are rare, and lists stay short. If not, use a |
77 | * different structure or at least keep the lists sorted... |
70 | * different structure or at least keep the lists sorted... |
78 | */ |
71 | */ |
79 | |
72 | |
80 | /* For each field in wants, */ |
73 | /* For each field in wants, */ |
81 | for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) { |
74 | for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) |
|
|
75 | { |
82 | key_value * has_field; |
76 | key_value *has_field; |
83 | |
77 | |
84 | /* Look for a field in has with the same key. */ |
78 | /* Look for a field in has with the same key. */ |
85 | has_field = get_ob_key_link(has, wants_field->key); |
79 | has_field = get_ob_key_link (has, wants_field->key); |
|
|
80 | |
|
|
81 | if (has_field == NULL) |
86 | |
82 | { |
87 | if (has_field == NULL) { |
|
|
88 | /* No field with that name. */ |
83 | /* No field with that name. */ |
89 | return FALSE; |
84 | return FALSE; |
90 | } |
|
|
91 | |
85 | } |
|
|
86 | |
92 | /* Found the matching field. */ |
87 | /* Found the matching field. */ |
93 | if (has_field->value != wants_field->value) { |
88 | if (has_field->value != wants_field->value) |
|
|
89 | { |
94 | /* Values don't match, so this half of the comparison is false. */ |
90 | /* Values don't match, so this half of the comparison is false. */ |
95 | return FALSE; |
91 | return FALSE; |
96 | } |
92 | } |
97 | |
93 | |
98 | /* If we get here, we found a match. Now for the next field in wants. */ |
94 | /* If we get here, we found a match. Now for the next field in wants. */ |
99 | } |
|
|
100 | |
95 | } |
|
|
96 | |
101 | /* If we get here, every field in wants has a matching field in has. */ |
97 | /* If we get here, every field in wants has a matching field in has. */ |
102 | return TRUE; |
98 | return TRUE; |
103 | } |
99 | } |
104 | |
100 | |
105 | /* Returns TRUE if ob1 has the same key_values as ob2. */ |
101 | /* Returns TRUE if ob1 has the same key_values as ob2. */ |
|
|
102 | static int |
106 | static int compare_ob_value_lists(const object * ob1, const object * ob2) { |
103 | compare_ob_value_lists (const object *ob1, const object *ob2) |
|
|
104 | { |
107 | /* However, there may be fields in has which aren't partnered in wants, |
105 | /* However, there may be fields in has which aren't partnered in wants, |
108 | * so we need to run the comparison *twice*. :( |
106 | * so we need to run the comparison *twice*. :( |
109 | */ |
107 | */ |
110 | return compare_ob_value_lists_one(ob1, ob2) && compare_ob_value_lists_one(ob2, ob1); |
108 | return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1); |
111 | } |
109 | } |
112 | |
110 | |
113 | /* Function examines the 2 objects given to it, and returns true if |
111 | /* Function examines the 2 objects given to it, and returns true if |
114 | * they can be merged together. |
112 | * they can be merged together. |
115 | * |
113 | * |
… | |
… | |
121 | * |
119 | * |
122 | * Improvements made with merge: Better checking on potion, and also |
120 | * Improvements made with merge: Better checking on potion, and also |
123 | * check weight |
121 | * check weight |
124 | */ |
122 | */ |
125 | |
123 | |
126 | int CAN_MERGE(object *ob1, object *ob2) { |
124 | bool object::can_merge (object *ob1, object *ob2) |
127 | |
125 | { |
128 | /* A couple quicksanity checks */ |
126 | /* A couple quicksanity checks */ |
129 | if ((ob1 == ob2) || (ob1->type != ob2->type)) return 0; |
127 | if ((ob1 == ob2) || (ob1->type != ob2->type)) |
|
|
128 | return 0; |
130 | |
129 | |
131 | if (ob1->speed != ob2->speed) return 0; |
130 | if (ob1->speed != ob2->speed) |
132 | /* Note sure why the following is the case - either the object has to |
|
|
133 | * be animated or have a very low speed. Is this an attempted monster |
|
|
134 | * check? |
|
|
135 | */ |
|
|
136 | if (!QUERY_FLAG(ob1,FLAG_ANIMATE) && FABS((ob1)->speed) > MIN_ACTIVE_SPEED) |
|
|
137 | return 0; |
131 | return 0; |
138 | |
132 | |
139 | /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that |
133 | /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that |
140 | * value could not be stored in a sint32 (which unfortunately sometimes is |
134 | * value could not be stored in a sint32 (which unfortunately sometimes is |
141 | * used to store nrof). |
135 | * used to store nrof). |
142 | */ |
136 | */ |
143 | if (ob1->nrof+ob2->nrof >= 1UL<<31) |
137 | if (ob1->nrof + ob2->nrof >= 1UL << 31) |
144 | return 0; |
138 | return 0; |
145 | |
139 | |
146 | /* This is really a spellbook check - really, we should |
|
|
147 | * check all objects in the inventory. |
|
|
148 | */ |
|
|
149 | if (ob1->inv || ob2->inv) { |
|
|
150 | /* if one object has inventory but the other doesn't, not equiv */ |
|
|
151 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) return 0; |
|
|
152 | |
|
|
153 | /* Now check to see if the two inventory objects could merge */ |
|
|
154 | if (!CAN_MERGE(ob1->inv, ob2->inv)) return 0; |
|
|
155 | |
|
|
156 | /* inventory ok - still need to check rest of this object to see |
|
|
157 | * if it is valid. |
|
|
158 | */ |
|
|
159 | } |
|
|
160 | |
|
|
161 | /* If the objects have been identified, set the BEEN_APPLIED flag. |
140 | /* If the objects have been identified, set the BEEN_APPLIED flag. |
162 | * This is to the comparison of the flags below will be OK. We |
141 | * This is to the comparison of the flags below will be OK. We |
163 | * just can't ignore the been applied or identified flags, as they |
142 | * just can't ignore the been applied or identified flags, as they |
164 | * are not equal - just if it has been identified, the been_applied |
143 | * are not equal - just if it has been identified, the been_applied |
165 | * flags lose any meaning. |
144 | * flags lose any meaning. |
166 | */ |
145 | */ |
167 | if (QUERY_FLAG(ob1, FLAG_IDENTIFIED)) |
146 | if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) |
168 | SET_FLAG(ob1, FLAG_BEEN_APPLIED); |
147 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
169 | |
148 | |
170 | if (QUERY_FLAG(ob2, FLAG_IDENTIFIED)) |
149 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
171 | SET_FLAG(ob2, FLAG_BEEN_APPLIED); |
150 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
172 | |
151 | |
173 | |
152 | |
174 | /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something |
153 | /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something |
175 | * being locked in inventory should prevent merging. |
154 | * being locked in inventory should prevent merging. |
176 | * 0x4 in flags3 is CLIENT_SENT |
155 | * 0x4 in flags3 is CLIENT_SENT |
177 | */ |
156 | */ |
178 | if ((ob1->arch != ob2->arch) || |
157 | if ((ob1->arch != ob2->arch) || |
179 | (ob1->flags[0] != ob2->flags[0]) || |
158 | (ob1->flags[0] != ob2->flags[0]) || |
180 | (ob1->flags[1] != ob2->flags[1]) || |
159 | (ob1->flags[1] != ob2->flags[1]) || |
181 | ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~ 0x400000)) || |
160 | ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) || |
182 | ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) || |
161 | ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) || |
183 | (ob1->name != ob2->name) || |
162 | (ob1->name != ob2->name) || |
184 | (ob1->title != ob2->title) || |
163 | (ob1->title != ob2->title) || |
185 | (ob1->msg != ob2->msg) || |
164 | (ob1->msg != ob2->msg) || |
186 | (ob1->weight != ob2->weight) || |
165 | (ob1->weight != ob2->weight) || |
187 | (memcmp(&ob1->resist, &ob2->resist, sizeof(ob1->resist))!=0) || |
166 | (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || |
188 | (memcmp(&ob1->stats, &ob2->stats, sizeof(ob1->stats))!=0) || |
167 | (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || |
189 | (ob1->attacktype != ob2->attacktype) || |
168 | (ob1->attacktype != ob2->attacktype) || |
190 | (ob1->magic != ob2->magic) || |
169 | (ob1->magic != ob2->magic) || |
191 | (ob1->slaying != ob2->slaying) || |
170 | (ob1->slaying != ob2->slaying) || |
192 | (ob1->skill != ob2->skill) || |
171 | (ob1->skill != ob2->skill) || |
193 | (ob1->value != ob2->value) || |
172 | (ob1->value != ob2->value) || |
194 | (ob1->animation_id != ob2->animation_id) || |
173 | (ob1->animation_id != ob2->animation_id) || |
195 | (ob1->client_type != ob2->client_type) || |
174 | (ob1->client_type != ob2->client_type) || |
196 | (ob1->materialname != ob2->materialname) || |
175 | (ob1->materialname != ob2->materialname) || |
197 | (ob1->lore != ob2->lore) || |
176 | (ob1->lore != ob2->lore) || |
198 | (ob1->subtype != ob2->subtype) || |
177 | (ob1->subtype != ob2->subtype) || |
199 | (ob1->move_type != ob2->move_type) || |
178 | (ob1->move_type != ob2->move_type) || |
200 | (ob1->move_block != ob2->move_block) || |
179 | (ob1->move_block != ob2->move_block) || |
201 | (ob1->move_allow != ob2->move_allow) || |
180 | (ob1->move_allow != ob2->move_allow) || |
202 | (ob1->move_on != ob2->move_on) || |
181 | (ob1->move_on != ob2->move_on) || |
203 | (ob1->move_off != ob2->move_off) || |
182 | (ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty)) |
204 | (ob1->move_slow != ob2->move_slow) || |
|
|
205 | (ob1->move_slow_penalty != ob2->move_slow_penalty) |
|
|
206 | ) |
|
|
207 | return 0; |
183 | return 0; |
208 | |
184 | |
|
|
185 | /* This is really a spellbook check - really, we should |
|
|
186 | * check all objects in the inventory. |
|
|
187 | */ |
|
|
188 | if (ob1->inv || ob2->inv) |
|
|
189 | { |
|
|
190 | /* if one object has inventory but the other doesn't, not equiv */ |
|
|
191 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
|
|
192 | return 0; |
|
|
193 | |
|
|
194 | /* Now check to see if the two inventory objects could merge */ |
|
|
195 | if (!CAN_MERGE (ob1->inv, ob2->inv)) |
|
|
196 | return 0; |
|
|
197 | |
|
|
198 | /* inventory ok - still need to check rest of this object to see |
|
|
199 | * if it is valid. |
|
|
200 | */ |
|
|
201 | } |
|
|
202 | |
209 | /* Don't merge objects that are applied. With the new 'body' code, |
203 | /* Don't merge objects that are applied. With the new 'body' code, |
210 | * it is possible for most any character to have more than one of |
204 | * it is possible for most any character to have more than one of |
211 | * some items equipped, and we don't want those to merge. |
205 | * some items equipped, and we don't want those to merge. |
212 | */ |
206 | */ |
213 | if (QUERY_FLAG(ob1, FLAG_APPLIED) || QUERY_FLAG(ob2, FLAG_APPLIED)) |
207 | if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED)) |
214 | return 0; |
208 | return 0; |
215 | |
209 | |
|
|
210 | /* Note sure why the following is the case - either the object has to |
|
|
211 | * be animated or have a very low speed. Is this an attempted monster |
|
|
212 | * check? |
|
|
213 | */ |
|
|
214 | if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) |
|
|
215 | return 0; |
|
|
216 | |
216 | switch (ob1->type) { |
217 | switch (ob1->type) |
217 | case SCROLL: |
|
|
218 | if (ob1->level != ob2->level) return 0; |
|
|
219 | break; |
|
|
220 | |
|
|
221 | } |
218 | { |
222 | if (ob1->key_values != NULL || ob2->key_values != NULL) { |
219 | case SCROLL: |
223 | /* At least one of these has key_values. */ |
220 | if (ob1->level != ob2->level) |
224 | if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) { |
|
|
225 | /* One has fields, but the other one doesn't. */ |
|
|
226 | return 0; |
221 | return 0; |
|
|
222 | break; |
|
|
223 | } |
|
|
224 | |
|
|
225 | if (ob1->key_values != NULL || ob2->key_values != NULL) |
|
|
226 | { |
|
|
227 | /* At least one of these has key_values. */ |
|
|
228 | if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) |
|
|
229 | /* One has fields, but the other one doesn't. */ |
|
|
230 | return 0; |
227 | } else if (!compare_ob_value_lists(ob1, ob2)) { |
231 | else if (!compare_ob_value_lists (ob1, ob2)) |
228 | return 0; |
232 | return 0; |
229 | } |
233 | } |
|
|
234 | |
|
|
235 | //TODO: generate an event or call into perl for additional checks |
|
|
236 | if (ob1->self || ob2->self) |
230 | } |
237 | { |
|
|
238 | ob1->optimise (); |
|
|
239 | ob2->optimise (); |
231 | |
240 | |
|
|
241 | if (ob1->self || ob2->self) |
|
|
242 | return 0; |
|
|
243 | } |
|
|
244 | |
232 | /* Everything passes, must be OK. */ |
245 | /* Everything passes, must be OK. */ |
233 | return 1; |
246 | return 1; |
234 | } |
247 | } |
235 | |
248 | |
236 | /* |
249 | /* |
237 | * sum_weight() is a recursive function which calculates the weight |
250 | * sum_weight() is a recursive function which calculates the weight |
238 | * an object is carrying. It goes through in figures out how much |
251 | * an object is carrying. It goes through in figures out how much |
239 | * containers are carrying, and sums it up. |
252 | * containers are carrying, and sums it up. |
240 | */ |
253 | */ |
241 | signed long sum_weight(object *op) { |
254 | signed long |
|
|
255 | sum_weight (object *op) |
|
|
256 | { |
242 | signed long sum; |
257 | signed long sum; |
243 | object *inv; |
258 | object *inv; |
|
|
259 | |
244 | for(sum = 0, inv = op->inv; inv != NULL; inv = inv->below) { |
260 | for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) |
|
|
261 | { |
245 | if (inv->inv) |
262 | if (inv->inv) |
246 | sum_weight(inv); |
263 | sum_weight (inv); |
247 | sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); |
264 | sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); |
248 | } |
265 | } |
249 | if (op->type == CONTAINER && op->stats.Str) |
266 | if (op->type == CONTAINER && op->stats.Str) |
250 | sum = (sum * (100 - op->stats.Str))/100; |
267 | sum = (sum * (100 - op->stats.Str)) / 100; |
251 | if(op->carrying != sum) |
268 | if (op->carrying != sum) |
252 | op->carrying = sum; |
269 | op->carrying = sum; |
253 | return sum; |
270 | return sum; |
254 | } |
271 | } |
255 | |
272 | |
256 | /** |
273 | /** |
257 | * Return the outermost environment object for a given object. |
274 | * Return the outermost environment object for a given object. |
258 | */ |
275 | */ |
259 | |
276 | |
|
|
277 | object * |
260 | object *object_get_env_recursive (object *op) { |
278 | object_get_env_recursive (object *op) |
|
|
279 | { |
261 | while (op->env != NULL) |
280 | while (op->env != NULL) |
262 | op = op->env; |
281 | op = op->env; |
263 | return op; |
282 | return op; |
264 | } |
283 | } |
265 | |
284 | |
266 | /* |
285 | /* |
267 | * Eneq(@csd.uu.se): Since we can have items buried in a character we need |
286 | * Eneq(@csd.uu.se): Since we can have items buried in a character we need |
268 | * a better check. We basically keeping traversing up until we can't |
287 | * a better check. We basically keeping traversing up until we can't |
269 | * or find a player. |
288 | * or find a player. |
270 | */ |
289 | */ |
271 | |
290 | |
|
|
291 | object * |
272 | object *is_player_inv (object *op) { |
292 | is_player_inv (object *op) |
|
|
293 | { |
273 | for (;op!=NULL&&op->type!=PLAYER; op=op->env) |
294 | for (; op != NULL && op->type != PLAYER; op = op->env) |
274 | if (op->env==op) |
295 | if (op->env == op) |
275 | op->env = NULL; |
296 | op->env = NULL; |
276 | return op; |
297 | return op; |
277 | } |
298 | } |
278 | |
299 | |
279 | /* |
300 | /* |
280 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
301 | * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. |
281 | * Some error messages. |
302 | * Some error messages. |
282 | * The result of the dump is stored in the static global errmsg array. |
303 | * The result of the dump is stored in the static global errmsg array. |
283 | */ |
304 | */ |
284 | |
305 | |
|
|
306 | void |
285 | void dump_object2(object *op) { |
307 | dump_object2 (object *op) |
|
|
308 | { |
|
|
309 | errmsg[0] = 0; |
|
|
310 | return; |
|
|
311 | //TODO//D#d# |
|
|
312 | #if 0 |
286 | char *cp; |
313 | char *cp; |
|
|
314 | |
287 | /* object *tmp;*/ |
315 | /* object *tmp;*/ |
288 | |
316 | |
289 | if(op->arch!=NULL) { |
317 | if (op->arch != NULL) |
|
|
318 | { |
290 | strcat(errmsg,"arch "); |
319 | strcat (errmsg, "arch "); |
291 | strcat(errmsg,op->arch->name?op->arch->name:"(null)"); |
320 | strcat (errmsg, op->arch->name ? op->arch->name : "(null)"); |
292 | strcat(errmsg,"\n"); |
321 | strcat (errmsg, "\n"); |
293 | if((cp=get_ob_diff(op,&empty_archetype->clone))!=NULL) |
322 | if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
294 | strcat(errmsg,cp); |
323 | strcat (errmsg, cp); |
295 | #if 0 |
324 | # if 0 |
296 | /* Don't dump player diffs - they are too long, mostly meaningless, and |
325 | /* Don't dump player diffs - they are too long, mostly meaningless, and |
297 | * will overflow the buffer. |
326 | * will overflow the buffer. |
298 | * Changed so that we don't dump inventory either. This may |
327 | * Changed so that we don't dump inventory either. This may |
299 | * also overflow the buffer. |
328 | * also overflow the buffer. |
300 | */ |
329 | */ |
301 | if(op->type!=PLAYER && (cp=get_ob_diff(op,&empty_archetype->clone))!=NULL) |
330 | if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
302 | strcat(errmsg,cp); |
331 | strcat (errmsg, cp); |
303 | for (tmp=op->inv; tmp; tmp=tmp->below) |
332 | for (tmp = op->inv; tmp; tmp = tmp->below) |
304 | dump_object2(tmp); |
333 | dump_object2 (tmp); |
|
|
334 | # endif |
|
|
335 | strcat (errmsg, "end\n"); |
|
|
336 | } |
|
|
337 | else |
|
|
338 | { |
|
|
339 | strcat (errmsg, "Object "); |
|
|
340 | if (op->name == NULL) |
|
|
341 | strcat (errmsg, "(null)"); |
|
|
342 | else |
|
|
343 | strcat (errmsg, op->name); |
|
|
344 | strcat (errmsg, "\n"); |
|
|
345 | # if 0 |
|
|
346 | if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL) |
|
|
347 | strcat (errmsg, cp); |
|
|
348 | for (tmp = op->inv; tmp; tmp = tmp->below) |
|
|
349 | dump_object2 (tmp); |
|
|
350 | # endif |
|
|
351 | strcat (errmsg, "end\n"); |
|
|
352 | } |
305 | #endif |
353 | #endif |
306 | strcat(errmsg,"end\n"); |
|
|
307 | } else { |
|
|
308 | strcat(errmsg,"Object "); |
|
|
309 | if (op->name==NULL) strcat(errmsg, "(null)"); |
|
|
310 | else strcat(errmsg,op->name); |
|
|
311 | strcat(errmsg,"\n"); |
|
|
312 | #if 0 |
|
|
313 | if((cp=get_ob_diff(op,&empty_archetype->clone))!=NULL) |
|
|
314 | strcat(errmsg,cp); |
|
|
315 | for (tmp=op->inv; tmp; tmp=tmp->below) |
|
|
316 | dump_object2(tmp); |
|
|
317 | #endif |
|
|
318 | strcat(errmsg,"end\n"); |
|
|
319 | } |
|
|
320 | } |
354 | } |
321 | |
355 | |
322 | /* |
356 | /* |
323 | * Dumps an object. Returns output in the static global errmsg array. |
357 | * Dumps an object. Returns output in the static global errmsg array. |
324 | */ |
358 | */ |
325 | |
359 | |
|
|
360 | void |
326 | void dump_object(object *op) { |
361 | dump_object (object *op) |
|
|
362 | { |
327 | if(op==NULL) { |
363 | if (op == NULL) |
|
|
364 | { |
328 | strcpy(errmsg,"[NULL pointer]"); |
365 | strcpy (errmsg, "[NULL pointer]"); |
329 | return; |
366 | return; |
330 | } |
367 | } |
331 | errmsg[0]='\0'; |
368 | errmsg[0] = '\0'; |
332 | dump_object2(op); |
369 | dump_object2 (op); |
333 | } |
370 | } |
334 | |
371 | |
335 | /* GROS - Dumps an object. Return the result into a string */ |
372 | void |
336 | /* Note that no checking is done for the validity of the target string, so */ |
|
|
337 | /* you need to be sure that you allocated enough space for it. */ |
|
|
338 | void dump_me(object *op, char *outstr) |
|
|
339 | { |
|
|
340 | char *cp; |
|
|
341 | |
|
|
342 | if(op==NULL) |
|
|
343 | { |
|
|
344 | strcpy(outstr,"[NULL pointer]"); |
|
|
345 | return; |
|
|
346 | } |
|
|
347 | outstr[0]='\0'; |
|
|
348 | |
|
|
349 | if(op->arch!=NULL) |
|
|
350 | { |
|
|
351 | strcat(outstr,"arch "); |
|
|
352 | strcat(outstr,op->arch->name?op->arch->name:"(null)"); |
|
|
353 | strcat(outstr,"\n"); |
|
|
354 | if((cp=get_ob_diff(op,&empty_archetype->clone))!=NULL) |
|
|
355 | strcat(outstr,cp); |
|
|
356 | strcat(outstr,"end\n"); |
|
|
357 | } |
|
|
358 | else |
|
|
359 | { |
|
|
360 | strcat(outstr,"Object "); |
|
|
361 | if (op->name==NULL) |
|
|
362 | strcat(outstr, "(null)"); |
|
|
363 | else |
|
|
364 | strcat(outstr,op->name); |
|
|
365 | strcat(outstr,"\n"); |
|
|
366 | strcat(outstr,"end\n"); |
|
|
367 | } |
|
|
368 | } |
|
|
369 | |
|
|
370 | /* |
|
|
371 | * This is really verbose...Can be triggered by the P key while in DM mode. |
|
|
372 | * All objects are dumped to stderr (or alternate logfile, if in server-mode) |
|
|
373 | */ |
|
|
374 | |
|
|
375 | void dump_all_objects(void) { |
373 | dump_all_objects (void) |
|
|
374 | { |
376 | object *op; |
375 | object *op; |
|
|
376 | |
377 | for(op=objects;op!=NULL;op=op->next) { |
377 | for (op = objects; op != NULL; op = op->next) |
|
|
378 | { |
378 | dump_object(op); |
379 | dump_object (op); |
379 | fprintf(logfile, "Object %d\n:%s\n", op->count, errmsg); |
380 | fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg); |
380 | } |
381 | } |
381 | } |
382 | } |
382 | |
383 | |
383 | /* |
384 | /* |
384 | * get_nearest_part(multi-object, object 2) returns the part of the |
385 | * get_nearest_part(multi-object, object 2) returns the part of the |
385 | * multi-object 1 which is closest to the second object. |
386 | * multi-object 1 which is closest to the second object. |
386 | * If it's not a multi-object, it is returned. |
387 | * If it's not a multi-object, it is returned. |
387 | */ |
388 | */ |
388 | |
389 | |
|
|
390 | object * |
389 | object *get_nearest_part(object *op, const object *pl) { |
391 | get_nearest_part (object *op, const object *pl) |
|
|
392 | { |
390 | object *tmp,*closest; |
393 | object *tmp, *closest; |
391 | int last_dist,i; |
394 | int last_dist, i; |
|
|
395 | |
392 | if(op->more==NULL) |
396 | if (op->more == NULL) |
393 | return op; |
397 | return op; |
394 | for(last_dist=distance(op,pl),closest=op,tmp=op->more;tmp!=NULL;tmp=tmp->more) |
398 | for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more) |
395 | if((i=distance(tmp,pl))<last_dist) |
399 | if ((i = distance (tmp, pl)) < last_dist) |
396 | closest=tmp,last_dist=i; |
400 | closest = tmp, last_dist = i; |
397 | return closest; |
401 | return closest; |
398 | } |
402 | } |
399 | |
403 | |
400 | /* |
404 | /* |
401 | * Returns the object which has the count-variable equal to the argument. |
405 | * Returns the object which has the count-variable equal to the argument. |
402 | */ |
406 | */ |
403 | |
407 | |
|
|
408 | object * |
404 | object *find_object(tag_t i) { |
409 | find_object (tag_t i) |
|
|
410 | { |
405 | object *op; |
411 | object *op; |
|
|
412 | |
406 | for(op=objects;op!=NULL;op=op->next) |
413 | for (op = objects; op != NULL; op = op->next) |
407 | if(op->count==i) |
414 | if (op->count == i) |
408 | break; |
415 | break; |
409 | return op; |
416 | return op; |
410 | } |
417 | } |
411 | |
418 | |
412 | /* |
419 | /* |
413 | * Returns the first object which has a name equal to the argument. |
420 | * Returns the first object which has a name equal to the argument. |
414 | * Used only by the patch command, but not all that useful. |
421 | * Used only by the patch command, but not all that useful. |
415 | * Enables features like "patch <name-of-other-player> food 999" |
422 | * Enables features like "patch <name-of-other-player> food 999" |
416 | */ |
423 | */ |
417 | |
424 | |
|
|
425 | object * |
418 | object *find_object_name(const char *str) { |
426 | find_object_name (const char *str) |
|
|
427 | { |
419 | const char *name=add_string(str); |
428 | const char *name = shstr::find (str); |
420 | object *op; |
429 | object *op; |
|
|
430 | |
421 | for(op=objects;op!=NULL;op=op->next) |
431 | for (op = objects; op != NULL; op = op->next) |
422 | if(op->name==name) |
432 | if (&op->name == name) |
423 | break; |
433 | break; |
424 | free_string(name); |
434 | |
425 | return op; |
435 | return op; |
426 | } |
436 | } |
427 | |
437 | |
|
|
438 | void |
428 | void free_all_object_data(void) { |
439 | free_all_object_data () |
429 | #ifdef MEMORY_DEBUG |
440 | { |
430 | object *op, *next; |
441 | LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); |
431 | |
|
|
432 | for (op=free_objects; op!=NULL; ) { |
|
|
433 | next=op->next; |
|
|
434 | free(op); |
|
|
435 | nrofallocobjects--; |
|
|
436 | nroffreeobjects--; |
|
|
437 | op=next; |
|
|
438 | } |
|
|
439 | #endif |
|
|
440 | LOG(llevDebug,"%d allocated objects, %d free objects, STARMAX=%d\n", |
|
|
441 | nrofallocobjects, nroffreeobjects,STARTMAX); |
|
|
442 | } |
442 | } |
443 | |
443 | |
444 | /* |
444 | /* |
445 | * Returns the object which this object marks as being the owner. |
445 | * Returns the object which this object marks as being the owner. |
446 | * A id-scheme is used to avoid pointing to objects which have been |
446 | * A id-scheme is used to avoid pointing to objects which have been |
… | |
… | |
450 | * prompt, he is removed, and we don't want to treat him as an owner of |
450 | * prompt, he is removed, and we don't want to treat him as an owner of |
451 | * anything, so check removed flag. I don't expect that this should break |
451 | * anything, so check removed flag. I don't expect that this should break |
452 | * anything - once an object is removed, it is basically dead anyways. |
452 | * anything - once an object is removed, it is basically dead anyways. |
453 | */ |
453 | */ |
454 | |
454 | |
|
|
455 | object * |
455 | object *get_owner(object *op) { |
456 | get_owner (object *op) |
|
|
457 | { |
456 | if(op->owner==NULL) |
458 | if (op->owner == NULL) |
457 | return NULL; |
|
|
458 | |
|
|
459 | if (!QUERY_FLAG(op->owner,FLAG_FREED) && !QUERY_FLAG(op->owner, FLAG_REMOVED) && |
|
|
460 | op->owner->count==op->ownercount) |
|
|
461 | return op->owner; |
|
|
462 | |
|
|
463 | op->owner=NULL; |
|
|
464 | op->ownercount=0; |
|
|
465 | return NULL; |
459 | return NULL; |
466 | } |
|
|
467 | |
460 | |
|
|
461 | if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount) |
|
|
462 | return op->owner; |
|
|
463 | |
|
|
464 | op->owner = NULL; |
|
|
465 | op->ownercount = 0; |
|
|
466 | return NULL; |
|
|
467 | } |
|
|
468 | |
|
|
469 | void |
468 | void clear_owner(object *op) |
470 | clear_owner (object *op) |
469 | { |
471 | { |
470 | if (!op) return; |
472 | if (!op) |
|
|
473 | return; |
471 | |
474 | |
472 | if (op->owner && op->ownercount == op->owner->count) |
475 | if (op->owner && op->ownercount == op->owner->count) |
473 | op->owner->refcount--; |
476 | op->owner->refcount--; |
474 | |
477 | |
475 | op->owner = NULL; |
478 | op->owner = NULL; |
476 | op->ownercount = 0; |
479 | op->ownercount = 0; |
477 | } |
480 | } |
478 | |
|
|
479 | |
|
|
480 | |
481 | |
481 | /* |
482 | /* |
482 | * Sets the owner and sets the skill and exp pointers to owner's current |
483 | * Sets the owner and sets the skill and exp pointers to owner's current |
483 | * skill and experience objects. |
484 | * skill and experience objects. |
484 | */ |
485 | */ |
|
|
486 | void |
485 | void set_owner (object *op, object *owner) |
487 | set_owner (object *op, object *owner) |
486 | { |
488 | { |
487 | if(owner==NULL||op==NULL) |
489 | if (owner == NULL || op == NULL) |
488 | return; |
490 | return; |
489 | |
491 | |
490 | /* next line added to allow objects which own objects */ |
492 | /* next line added to allow objects which own objects */ |
491 | /* Add a check for ownercounts in here, as I got into an endless loop |
493 | /* Add a check for ownercounts in here, as I got into an endless loop |
492 | * with the fireball owning a poison cloud which then owned the |
494 | * with the fireball owning a poison cloud which then owned the |
493 | * fireball. I believe that was caused by one of the objects getting |
495 | * fireball. I believe that was caused by one of the objects getting |
494 | * freed and then another object replacing it. Since the ownercounts |
496 | * freed and then another object replacing it. Since the ownercounts |
495 | * didn't match, this check is valid and I believe that cause is valid. |
497 | * didn't match, this check is valid and I believe that cause is valid. |
496 | */ |
498 | */ |
497 | while (owner->owner && owner!=owner->owner && |
499 | while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count) |
498 | owner->ownercount==owner->owner->count) owner=owner->owner; |
500 | owner = owner->owner; |
499 | |
501 | |
500 | /* IF the owner still has an owner, we did not resolve to a final owner. |
502 | /* IF the owner still has an owner, we did not resolve to a final owner. |
501 | * so lets not add to that. |
503 | * so lets not add to that. |
502 | */ |
504 | */ |
503 | if (owner->owner) return; |
505 | if (owner->owner) |
|
|
506 | return; |
504 | |
507 | |
505 | op->owner=owner; |
508 | op->owner = owner; |
506 | |
509 | |
507 | op->ownercount=owner->count; |
510 | op->ownercount = owner->count; |
508 | owner->refcount++; |
511 | owner->refcount++; |
509 | |
|
|
510 | } |
512 | } |
511 | |
513 | |
512 | /* Set the owner to clone's current owner and set the skill and experience |
514 | /* Set the owner to clone's current owner and set the skill and experience |
513 | * objects to clone's objects (typically those objects that where the owner's |
515 | * objects to clone's objects (typically those objects that where the owner's |
514 | * current skill and experience objects at the time when clone's owner was |
516 | * current skill and experience objects at the time when clone's owner was |
… | |
… | |
517 | * Use this function if player created an object (e.g. fire bullet, swarm |
519 | * Use this function if player created an object (e.g. fire bullet, swarm |
518 | * spell), and this object creates further objects whose kills should be |
520 | * spell), and this object creates further objects whose kills should be |
519 | * accounted for the player's original skill, even if player has changed |
521 | * accounted for the player's original skill, even if player has changed |
520 | * skills meanwhile. |
522 | * skills meanwhile. |
521 | */ |
523 | */ |
|
|
524 | void |
522 | void copy_owner (object *op, object *clone) |
525 | copy_owner (object *op, object *clone) |
523 | { |
526 | { |
524 | object *owner = get_owner (clone); |
527 | object *owner = get_owner (clone); |
|
|
528 | |
525 | if (owner == NULL) { |
529 | if (owner == NULL) |
|
|
530 | { |
526 | /* players don't have owners - they own themselves. Update |
531 | /* players don't have owners - they own themselves. Update |
527 | * as appropriate. |
532 | * as appropriate. |
528 | */ |
533 | */ |
529 | if (clone->type == PLAYER) owner=clone; |
534 | if (clone->type == PLAYER) |
530 | else return; |
535 | owner = clone; |
|
|
536 | else |
|
|
537 | return; |
531 | } |
538 | } |
|
|
539 | |
532 | set_owner(op, owner); |
540 | set_owner (op, owner); |
533 | |
|
|
534 | } |
|
|
535 | |
|
|
536 | /* |
|
|
537 | * Resets vital variables in an object |
|
|
538 | */ |
|
|
539 | |
|
|
540 | void reset_object(object *op) { |
|
|
541 | |
|
|
542 | op->name = NULL; |
|
|
543 | op->name_pl = NULL; |
|
|
544 | op->title = NULL; |
|
|
545 | op->race = NULL; |
|
|
546 | op->slaying = NULL; |
|
|
547 | op->skill = NULL; |
|
|
548 | op->msg = NULL; |
|
|
549 | op->materialname = NULL; |
|
|
550 | op->lore = NULL; |
|
|
551 | op->current_weapon_script = NULL; |
|
|
552 | clear_object(op); |
|
|
553 | } |
541 | } |
554 | |
542 | |
555 | /* Zero the key_values on op, decrementing the shared-string |
543 | /* Zero the key_values on op, decrementing the shared-string |
556 | * refcounts and freeing the links. |
544 | * refcounts and freeing the links. |
557 | */ |
545 | */ |
|
|
546 | static void |
558 | static void free_key_values(object * op) { |
547 | free_key_values (object *op) |
559 | key_value * i; |
548 | { |
560 | key_value * next = NULL; |
549 | for (key_value *i = op->key_values; i != 0;) |
561 | |
550 | { |
562 | if (op->key_values == NULL) return; |
551 | key_value *next = i->next; |
|
|
552 | delete i; |
|
|
553 | |
|
|
554 | i = next; |
563 | |
555 | } |
564 | for (i = op->key_values; i != NULL; i = next) { |
556 | |
565 | /* Store next *first*. */ |
|
|
566 | next = i->next; |
|
|
567 | |
|
|
568 | if (i->key) FREE_AND_CLEAR_STR(i->key); |
|
|
569 | if (i->value) FREE_AND_CLEAR_STR(i->value); |
|
|
570 | i->next = NULL; |
|
|
571 | free(i); |
|
|
572 | } |
|
|
573 | |
|
|
574 | op->key_values = NULL; |
557 | op->key_values = 0; |
575 | } |
558 | } |
576 | |
559 | |
|
|
560 | void object::clear () |
|
|
561 | { |
|
|
562 | attachable_base::clear (); |
|
|
563 | |
|
|
564 | free_key_values (this); |
|
|
565 | |
|
|
566 | clear_owner (this); |
|
|
567 | |
|
|
568 | name = 0; |
|
|
569 | name_pl = 0; |
|
|
570 | title = 0; |
|
|
571 | race = 0; |
|
|
572 | slaying = 0; |
|
|
573 | skill = 0; |
|
|
574 | msg = 0; |
|
|
575 | lore = 0; |
|
|
576 | custom_name = 0; |
|
|
577 | materialname = 0; |
|
|
578 | |
|
|
579 | memset (static_cast < object_pod * >(this), 0, sizeof (object_pod)); |
|
|
580 | |
|
|
581 | SET_FLAG (this, FLAG_REMOVED); |
|
|
582 | } |
|
|
583 | |
|
|
584 | void object::clone (object *destination) |
|
|
585 | { |
|
|
586 | *(object_copy *) destination = *this; |
|
|
587 | *(object_pod *) destination = *this; |
|
|
588 | |
|
|
589 | if (self || cb) |
|
|
590 | INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination)); |
|
|
591 | } |
577 | |
592 | |
578 | /* |
593 | /* |
579 | * clear_object() frees everything allocated by an object, and also |
594 | * clear_object() frees everything allocated by an object, and also |
580 | * clears all variables and flags to default settings. |
595 | * clears all variables and flags to default settings. |
581 | */ |
596 | */ |
582 | |
597 | |
|
|
598 | void |
583 | void clear_object(object *op) { |
599 | clear_object (object *op) |
|
|
600 | { |
584 | op->clear (); |
601 | op->clear (); |
585 | |
602 | |
586 | event *evt; |
|
|
587 | event *evt2; |
|
|
588 | |
|
|
589 | /* redo this to be simpler/more efficient. Was also seeing |
|
|
590 | * crashes in the old code. Move this to the top - am |
|
|
591 | * seeing periodic crashes in this code, and would like to have |
|
|
592 | * as much info available as possible (eg, object name). |
|
|
593 | */ |
|
|
594 | for (evt = op->events; evt; evt=evt2) { |
|
|
595 | evt2 = evt->next; |
|
|
596 | |
|
|
597 | if (evt->hook != NULL) FREE_AND_CLEAR_STR(evt->hook); |
|
|
598 | if (evt->plugin != NULL) FREE_AND_CLEAR_STR(evt->plugin); |
|
|
599 | if (evt->options != NULL) FREE_AND_CLEAR_STR(evt->options); |
|
|
600 | |
|
|
601 | free(evt); |
|
|
602 | } |
|
|
603 | op->events = NULL; |
|
|
604 | |
|
|
605 | free_key_values(op); |
|
|
606 | |
|
|
607 | /* the memset will clear all these values for us, but we need |
|
|
608 | * to reduce the refcount on them. |
|
|
609 | */ |
|
|
610 | if (op->name!=NULL) FREE_AND_CLEAR_STR(op->name); |
|
|
611 | if (op->name_pl!=NULL) FREE_AND_CLEAR_STR(op->name_pl); |
|
|
612 | if (op->title != NULL) FREE_AND_CLEAR_STR(op->title); |
|
|
613 | if (op->race!=NULL) FREE_AND_CLEAR_STR(op->race); |
|
|
614 | if (op->slaying!=NULL) FREE_AND_CLEAR_STR(op->slaying); |
|
|
615 | if (op->skill!=NULL) FREE_AND_CLEAR_STR(op->skill); |
|
|
616 | if (op->msg!=NULL) FREE_AND_CLEAR_STR(op->msg); |
|
|
617 | if (op->lore!=NULL) FREE_AND_CLEAR_STR(op->lore); |
|
|
618 | if (op->materialname!= NULL) FREE_AND_CLEAR_STR(op->materialname); |
|
|
619 | |
|
|
620 | |
|
|
621 | memset((void*)op, 0, sizeof (object_special)); |
|
|
622 | /* Below here, we clear things that are not done by the memset, |
|
|
623 | * or set default values that are not zero. |
|
|
624 | */ |
|
|
625 | /* This is more or less true */ |
|
|
626 | SET_FLAG(op, FLAG_REMOVED); |
|
|
627 | |
|
|
628 | |
|
|
629 | op->contr = NULL; |
603 | op->contr = NULL; |
630 | op->below=NULL; |
604 | op->below = NULL; |
631 | op->above=NULL; |
605 | op->above = NULL; |
632 | op->inv=NULL; |
606 | op->inv = NULL; |
633 | op->events=NULL; |
|
|
634 | op->container=NULL; |
607 | op->container = NULL; |
635 | op->env=NULL; |
608 | op->env = NULL; |
636 | op->more=NULL; |
609 | op->more = NULL; |
637 | op->head=NULL; |
610 | op->head = NULL; |
638 | op->map=NULL; |
611 | op->map = NULL; |
639 | op->refcount=0; |
612 | op->refcount = 0; |
640 | op->active_next = NULL; |
613 | op->active_next = NULL; |
641 | op->active_prev = NULL; |
614 | op->active_prev = NULL; |
642 | /* What is not cleared is next, prev, and count */ |
615 | /* What is not cleared is next, prev, and count */ |
643 | |
616 | |
644 | op->expmul=1.0; |
617 | op->expmul = 1.0; |
645 | op->face = blank_face; |
618 | op->face = blank_face; |
646 | op->attacked_by_count = (tag_t) -1; |
619 | op->attacked_by_count = -1; |
|
|
620 | |
647 | if (settings.casting_time) |
621 | if (settings.casting_time) |
648 | op->casting_time = -1; |
622 | op->casting_time = -1; |
649 | |
|
|
650 | } |
623 | } |
651 | |
624 | |
652 | /* |
625 | /* |
653 | * copy object first frees everything allocated by the second object, |
626 | * copy object first frees everything allocated by the second object, |
654 | * and then copies the contends of the first object into the second |
627 | * and then copies the contends of the first object into the second |
… | |
… | |
656 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
629 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
657 | * if the first object is freed, the pointers in the new object |
630 | * if the first object is freed, the pointers in the new object |
658 | * will point at garbage. |
631 | * will point at garbage. |
659 | */ |
632 | */ |
660 | |
633 | |
|
|
634 | void |
661 | void copy_object(object *op2, object *op) { |
635 | copy_object (object *op2, object *op) |
662 | int is_freed=QUERY_FLAG(op,FLAG_FREED),is_removed=QUERY_FLAG(op,FLAG_REMOVED); |
636 | { |
663 | event *evt, *evt2, *evt_new; |
637 | bool is_freed = QUERY_FLAG (op, FLAG_FREED); |
|
|
638 | bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); |
664 | |
639 | |
665 | op->clear (); |
|
|
666 | |
|
|
667 | /* Decrement the refcounts, but don't bother zeroing the fields; |
|
|
668 | they'll be overwritten by memcpy. */ |
|
|
669 | if(op->name!=NULL) free_string(op->name); |
|
|
670 | if(op->name_pl!=NULL) free_string(op->name_pl); |
|
|
671 | if(op->title!=NULL) free_string(op->title); |
|
|
672 | if(op->race!=NULL) free_string(op->race); |
|
|
673 | if(op->slaying!=NULL) free_string(op->slaying); |
|
|
674 | if(op->skill!=NULL) free_string(op->skill); |
|
|
675 | if(op->msg!=NULL) free_string(op->msg); |
|
|
676 | if(op->lore!=NULL) free_string(op->lore); |
|
|
677 | if(op->materialname != NULL) free_string(op->materialname); |
|
|
678 | if(op->custom_name != NULL) free_string(op->custom_name); |
|
|
679 | |
|
|
680 | /* Basically, same code as from clear_object() */ |
|
|
681 | for (evt = op->events; evt; evt=evt2) { |
|
|
682 | evt2 = evt->next; |
|
|
683 | |
|
|
684 | if (evt->hook != NULL) FREE_AND_CLEAR_STR(evt->hook); |
|
|
685 | if (evt->plugin != NULL) FREE_AND_CLEAR_STR(evt->plugin); |
|
|
686 | if (evt->options != NULL) FREE_AND_CLEAR_STR(evt->options); |
|
|
687 | |
|
|
688 | free(evt); |
|
|
689 | } |
|
|
690 | op->events = NULL; |
|
|
691 | |
|
|
692 | free_key_values(op); |
|
|
693 | |
|
|
694 | *(object_special *)op = *(object_special *)op2; |
|
|
695 | op->clone (op2); |
640 | op2->clone (op); |
696 | |
641 | |
697 | if(is_freed) SET_FLAG(op,FLAG_FREED); |
642 | if (is_freed) |
698 | if(is_removed) SET_FLAG(op,FLAG_REMOVED); |
643 | SET_FLAG (op, FLAG_FREED); |
699 | if(op->name!=NULL) add_refcount(op->name); |
644 | if (is_removed) |
700 | if(op->name_pl!=NULL) add_refcount(op->name_pl); |
645 | SET_FLAG (op, FLAG_REMOVED); |
701 | if(op->title!=NULL) add_refcount(op->title); |
|
|
702 | if(op->race!=NULL) add_refcount(op->race); |
|
|
703 | if(op->slaying!=NULL) add_refcount(op->slaying); |
|
|
704 | if(op->skill!=NULL) add_refcount(op->skill); |
|
|
705 | if(op->lore!=NULL) add_refcount(op->lore); |
|
|
706 | if(op->msg!=NULL) add_refcount(op->msg); |
|
|
707 | if(op->custom_name!=NULL) add_refcount(op->custom_name); |
|
|
708 | if (op->materialname != NULL) add_refcount(op->materialname); |
|
|
709 | |
646 | |
710 | if((op2->speed<0) && !editor) |
647 | if (op2->speed < 0) |
711 | op->speed_left=op2->speed_left-RANDOM()%200/100.0; |
648 | op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; |
712 | |
649 | |
713 | /* Copy over event information */ |
|
|
714 | evt2 = NULL; |
|
|
715 | for (evt = op2->events; evt; evt=evt->next) { |
|
|
716 | evt_new = (event *) malloc(sizeof(event)); |
|
|
717 | memcpy(evt_new, evt, sizeof(event)); |
|
|
718 | if (evt_new->hook) add_refcount(evt_new->hook); |
|
|
719 | if (evt_new->plugin) add_refcount(evt_new->plugin); |
|
|
720 | if (evt_new->options) add_refcount(evt_new->options); |
|
|
721 | evt_new->next = NULL; |
|
|
722 | |
|
|
723 | /* Try to be a little clever here, and store away the |
|
|
724 | * last event we copied, so that its simpler to update the |
|
|
725 | * pointer. |
|
|
726 | */ |
|
|
727 | if (evt2) |
|
|
728 | evt2->next = evt_new; |
|
|
729 | else |
|
|
730 | op->events = evt_new; |
|
|
731 | |
|
|
732 | evt2 = evt_new; |
|
|
733 | } |
|
|
734 | /* Copy over key_values, if any. */ |
650 | /* Copy over key_values, if any. */ |
735 | if (op2->key_values != NULL) { |
651 | if (op2->key_values) |
736 | key_value * tail = NULL; |
652 | { |
|
|
653 | key_value *tail = 0; |
737 | key_value * i; |
654 | key_value *i; |
738 | |
655 | |
739 | op->key_values = NULL; |
656 | op->key_values = 0; |
740 | |
657 | |
741 | for (i = op2->key_values; i != NULL; i = i->next) { |
658 | for (i = op2->key_values; i; i = i->next) |
742 | key_value * new_link = (key_value *) malloc(sizeof(key_value)); |
659 | { |
|
|
660 | key_value *new_link = new key_value; |
743 | |
661 | |
744 | new_link->next = NULL; |
662 | new_link->next = 0; |
745 | new_link->key = add_refcount(i->key); |
663 | new_link->key = i->key; |
746 | if (i->value) |
664 | new_link->value = i->value; |
747 | new_link->value = add_refcount(i->value); |
|
|
748 | else |
|
|
749 | new_link->value = NULL; |
|
|
750 | |
665 | |
751 | /* Try and be clever here, too. */ |
666 | /* Try and be clever here, too. */ |
752 | if (op->key_values == NULL) { |
667 | if (!op->key_values) |
|
|
668 | { |
753 | op->key_values = new_link; |
669 | op->key_values = new_link; |
754 | tail = new_link; |
670 | tail = new_link; |
755 | } else { |
671 | } |
756 | tail->next = new_link; |
672 | else |
757 | tail = new_link; |
673 | { |
|
|
674 | tail->next = new_link; |
|
|
675 | tail = new_link; |
|
|
676 | } |
|
|
677 | } |
758 | } |
678 | } |
759 | } |
|
|
760 | } |
|
|
761 | |
679 | |
762 | update_ob_speed(op); |
680 | update_ob_speed (op); |
763 | } |
|
|
764 | |
|
|
765 | /* |
|
|
766 | * expand_objects() allocates more objects for the list of unused objects. |
|
|
767 | * It is called from get_object() if the unused list is empty. |
|
|
768 | */ |
|
|
769 | |
|
|
770 | void expand_objects(void) { |
|
|
771 | int i; |
|
|
772 | object *obj; |
|
|
773 | obj = (object *) CALLOC(OBJ_EXPAND,sizeof(object)); |
|
|
774 | |
|
|
775 | if(obj==NULL) |
|
|
776 | fatal(OUT_OF_MEMORY); |
|
|
777 | free_objects=obj; |
|
|
778 | obj[0].prev=NULL; |
|
|
779 | obj[0].next= &obj[1], |
|
|
780 | SET_FLAG(&(obj[0]), FLAG_REMOVED); |
|
|
781 | SET_FLAG(&(obj[0]), FLAG_FREED); |
|
|
782 | |
|
|
783 | for(i=1;i<OBJ_EXPAND-1;i++) { |
|
|
784 | obj[i].next= &obj[i+1], |
|
|
785 | obj[i].prev= &obj[i-1], |
|
|
786 | SET_FLAG(&(obj[i]), FLAG_REMOVED); |
|
|
787 | SET_FLAG(&(obj[i]), FLAG_FREED); |
|
|
788 | } |
|
|
789 | obj[OBJ_EXPAND-1].prev= &obj[OBJ_EXPAND-2], |
|
|
790 | obj[OBJ_EXPAND-1].next=NULL, |
|
|
791 | SET_FLAG(&(obj[OBJ_EXPAND-1]), FLAG_REMOVED); |
|
|
792 | SET_FLAG(&(obj[OBJ_EXPAND-1]), FLAG_FREED); |
|
|
793 | |
|
|
794 | nrofallocobjects += OBJ_EXPAND; |
|
|
795 | nroffreeobjects += OBJ_EXPAND; |
|
|
796 | } |
|
|
797 | |
|
|
798 | /* |
|
|
799 | * get_object() grabs an object from the list of unused objects, makes |
|
|
800 | * sure it is initialised, and returns it. |
|
|
801 | * If there are no free objects, expand_objects() is called to get more. |
|
|
802 | */ |
|
|
803 | |
|
|
804 | object *get_object(void) { |
|
|
805 | object *op; |
|
|
806 | |
|
|
807 | if(free_objects==NULL) { |
|
|
808 | expand_objects(); |
|
|
809 | } |
|
|
810 | op=free_objects; |
|
|
811 | #ifdef MEMORY_DEBUG |
|
|
812 | /* The idea is hopefully by doing a realloc, the memory |
|
|
813 | * debugging program will now use the current stack trace to |
|
|
814 | * report leaks. |
|
|
815 | */ |
|
|
816 | op = realloc(op, sizeof(object)); |
|
|
817 | SET_FLAG(op, FLAG_REMOVED); |
|
|
818 | SET_FLAG(op, FLAG_FREED); |
|
|
819 | #endif |
|
|
820 | |
|
|
821 | if(!QUERY_FLAG(op,FLAG_FREED)) { |
|
|
822 | LOG(llevError,"Fatal: Getting busy object.\n"); |
|
|
823 | } |
|
|
824 | free_objects=op->next; |
|
|
825 | if(free_objects!=NULL) |
|
|
826 | free_objects->prev=NULL; |
|
|
827 | op->count= ++ob_count; |
|
|
828 | op->name=NULL; |
|
|
829 | op->name_pl=NULL; |
|
|
830 | op->title=NULL; |
|
|
831 | op->race=NULL; |
|
|
832 | op->slaying=NULL; |
|
|
833 | op->skill = NULL; |
|
|
834 | op->lore=NULL; |
|
|
835 | op->msg=NULL; |
|
|
836 | op->materialname=NULL; |
|
|
837 | op->next=objects; |
|
|
838 | op->prev=NULL; |
|
|
839 | op->active_next = NULL; |
|
|
840 | op->active_prev = NULL; |
|
|
841 | if(objects!=NULL) |
|
|
842 | objects->prev=op; |
|
|
843 | objects=op; |
|
|
844 | clear_object(op); |
|
|
845 | SET_FLAG(op,FLAG_REMOVED); |
|
|
846 | nroffreeobjects--; |
|
|
847 | return op; |
|
|
848 | } |
681 | } |
849 | |
682 | |
850 | /* |
683 | /* |
851 | * If an object with the IS_TURNABLE() flag needs to be turned due |
684 | * If an object with the IS_TURNABLE() flag needs to be turned due |
852 | * to the closest player being on the other side, this function can |
685 | * to the closest player being on the other side, this function can |
853 | * be called to update the face variable, _and_ how it looks on the map. |
686 | * be called to update the face variable, _and_ how it looks on the map. |
854 | */ |
687 | */ |
855 | |
688 | |
|
|
689 | void |
856 | void update_turn_face(object *op) { |
690 | update_turn_face (object *op) |
|
|
691 | { |
857 | if(!QUERY_FLAG(op,FLAG_IS_TURNABLE)||op->arch==NULL) |
692 | if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) |
858 | return; |
693 | return; |
859 | SET_ANIMATION(op, op->direction); |
694 | SET_ANIMATION (op, op->direction); |
860 | update_object(op,UP_OBJ_FACE); |
695 | update_object (op, UP_OBJ_FACE); |
861 | } |
696 | } |
862 | |
697 | |
863 | /* |
698 | /* |
864 | * Updates the speed of an object. If the speed changes from 0 to another |
699 | * Updates the speed of an object. If the speed changes from 0 to another |
865 | * value, or vice versa, then add/remove the object from the active list. |
700 | * value, or vice versa, then add/remove the object from the active list. |
866 | * This function needs to be called whenever the speed of an object changes. |
701 | * This function needs to be called whenever the speed of an object changes. |
867 | */ |
702 | */ |
868 | |
703 | |
|
|
704 | void |
869 | void update_ob_speed(object *op) { |
705 | update_ob_speed (object *op) |
|
|
706 | { |
870 | extern int arch_init; |
707 | extern int arch_init; |
871 | |
708 | |
872 | /* No reason putting the archetypes objects on the speed list, |
709 | /* No reason putting the archetypes objects on the speed list, |
873 | * since they never really need to be updated. |
710 | * since they never really need to be updated. |
874 | */ |
711 | */ |
875 | |
712 | |
876 | if (QUERY_FLAG(op, FLAG_FREED) && op->speed) { |
713 | if (QUERY_FLAG (op, FLAG_FREED) && op->speed) |
|
|
714 | { |
877 | LOG(llevError,"Object %s is freed but has speed.\n", op->name); |
715 | LOG (llevError, "Object %s is freed but has speed.\n", &op->name); |
878 | #ifdef MANY_CORES |
716 | #ifdef MANY_CORES |
879 | abort(); |
717 | abort (); |
880 | #else |
718 | #else |
881 | op->speed = 0; |
719 | op->speed = 0; |
882 | #endif |
720 | #endif |
883 | } |
721 | } |
884 | if (arch_init) { |
722 | if (arch_init) |
885 | return; |
|
|
886 | } |
723 | { |
|
|
724 | return; |
|
|
725 | } |
887 | if (FABS(op->speed)>MIN_ACTIVE_SPEED) { |
726 | if (FABS (op->speed) > MIN_ACTIVE_SPEED) |
|
|
727 | { |
888 | /* If already on active list, don't do anything */ |
728 | /* If already on active list, don't do anything */ |
889 | if (op->active_next || op->active_prev || op==active_objects) |
729 | if (op->active_next || op->active_prev || op == active_objects) |
890 | return; |
730 | return; |
891 | |
731 | |
892 | /* process_events() expects us to insert the object at the beginning |
732 | /* process_events() expects us to insert the object at the beginning |
893 | * of the list. */ |
733 | * of the list. */ |
894 | op->active_next = active_objects; |
734 | op->active_next = active_objects; |
895 | if (op->active_next!=NULL) |
735 | if (op->active_next != NULL) |
896 | op->active_next->active_prev = op; |
736 | op->active_next->active_prev = op; |
897 | active_objects = op; |
737 | active_objects = op; |
|
|
738 | } |
|
|
739 | else |
898 | } |
740 | { |
899 | else { |
|
|
900 | /* If not on the active list, nothing needs to be done */ |
741 | /* If not on the active list, nothing needs to be done */ |
901 | if (!op->active_next && !op->active_prev && op!=active_objects) |
742 | if (!op->active_next && !op->active_prev && op != active_objects) |
902 | return; |
743 | return; |
903 | |
744 | |
904 | if (op->active_prev==NULL) { |
745 | if (op->active_prev == NULL) |
|
|
746 | { |
905 | active_objects = op->active_next; |
747 | active_objects = op->active_next; |
906 | if (op->active_next!=NULL) |
748 | if (op->active_next != NULL) |
907 | op->active_next->active_prev = NULL; |
749 | op->active_next->active_prev = NULL; |
908 | } |
750 | } |
909 | else { |
751 | else |
|
|
752 | { |
910 | op->active_prev->active_next = op->active_next; |
753 | op->active_prev->active_next = op->active_next; |
911 | if (op->active_next) |
754 | if (op->active_next) |
912 | op->active_next->active_prev = op->active_prev; |
755 | op->active_next->active_prev = op->active_prev; |
913 | } |
756 | } |
914 | op->active_next = NULL; |
757 | op->active_next = NULL; |
915 | op->active_prev = NULL; |
758 | op->active_prev = NULL; |
916 | } |
759 | } |
917 | } |
760 | } |
918 | |
761 | |
919 | /* This function removes object 'op' from the list of active |
762 | /* This function removes object 'op' from the list of active |
920 | * objects. |
763 | * objects. |
… | |
… | |
922 | * reference maps where you don't want an object that isn't |
765 | * reference maps where you don't want an object that isn't |
923 | * in play chewing up cpu time getting processed. |
766 | * in play chewing up cpu time getting processed. |
924 | * The reverse of this is to call update_ob_speed, which |
767 | * The reverse of this is to call update_ob_speed, which |
925 | * will do the right thing based on the speed of the object. |
768 | * will do the right thing based on the speed of the object. |
926 | */ |
769 | */ |
|
|
770 | void |
927 | void remove_from_active_list(object *op) |
771 | remove_from_active_list (object *op) |
928 | { |
772 | { |
929 | /* If not on the active list, nothing needs to be done */ |
773 | /* If not on the active list, nothing needs to be done */ |
930 | if (!op->active_next && !op->active_prev && op!=active_objects) |
774 | if (!op->active_next && !op->active_prev && op != active_objects) |
931 | return; |
775 | return; |
932 | |
776 | |
933 | if (op->active_prev==NULL) { |
777 | if (op->active_prev == NULL) |
|
|
778 | { |
934 | active_objects = op->active_next; |
779 | active_objects = op->active_next; |
935 | if (op->active_next!=NULL) |
780 | if (op->active_next != NULL) |
936 | op->active_next->active_prev = NULL; |
781 | op->active_next->active_prev = NULL; |
|
|
782 | } |
|
|
783 | else |
937 | } |
784 | { |
938 | else { |
|
|
939 | op->active_prev->active_next = op->active_next; |
785 | op->active_prev->active_next = op->active_next; |
940 | if (op->active_next) |
786 | if (op->active_next) |
941 | op->active_next->active_prev = op->active_prev; |
787 | op->active_next->active_prev = op->active_prev; |
942 | } |
788 | } |
943 | op->active_next = NULL; |
789 | op->active_next = NULL; |
944 | op->active_prev = NULL; |
790 | op->active_prev = NULL; |
945 | } |
791 | } |
946 | |
792 | |
947 | /* |
793 | /* |
948 | * update_object() updates the array which represents the map. |
794 | * update_object() updates the array which represents the map. |
949 | * It takes into account invisible objects (and represent squares covered |
795 | * It takes into account invisible objects (and represent squares covered |
… | |
… | |
964 | * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update |
810 | * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update |
965 | * as that is easier than trying to look at what may have changed. |
811 | * as that is easier than trying to look at what may have changed. |
966 | * UP_OBJ_FACE: only the objects face has changed. |
812 | * UP_OBJ_FACE: only the objects face has changed. |
967 | */ |
813 | */ |
968 | |
814 | |
|
|
815 | void |
969 | void update_object(object *op, int action) { |
816 | update_object (object *op, int action) |
|
|
817 | { |
970 | int update_now=0, flags; |
818 | int update_now = 0, flags; |
971 | MoveType move_on, move_off, move_block, move_slow; |
819 | MoveType move_on, move_off, move_block, move_slow; |
972 | |
820 | |
973 | if (op == NULL) { |
821 | if (op == NULL) |
|
|
822 | { |
974 | /* this should never happen */ |
823 | /* this should never happen */ |
975 | LOG(llevDebug,"update_object() called for NULL object.\n"); |
824 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
976 | return; |
825 | return; |
977 | } |
|
|
978 | |
826 | } |
|
|
827 | |
979 | if(op->env!=NULL) { |
828 | if (op->env != NULL) |
|
|
829 | { |
980 | /* Animation is currently handled by client, so nothing |
830 | /* Animation is currently handled by client, so nothing |
981 | * to do in this case. |
831 | * to do in this case. |
982 | */ |
832 | */ |
983 | return; |
833 | return; |
984 | } |
834 | } |
985 | |
835 | |
986 | /* If the map is saving, don't do anything as everything is |
836 | /* If the map is saving, don't do anything as everything is |
987 | * going to get freed anyways. |
837 | * going to get freed anyways. |
988 | */ |
838 | */ |
989 | if (!op->map || op->map->in_memory == MAP_SAVING) return; |
839 | if (!op->map || op->map->in_memory == MAP_SAVING) |
990 | |
840 | return; |
|
|
841 | |
991 | /* make sure the object is within map boundaries */ |
842 | /* make sure the object is within map boundaries */ |
992 | if (op->x < 0 || op->x >= MAP_WIDTH(op->map) || |
843 | if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) |
993 | op->y < 0 || op->y >= MAP_HEIGHT(op->map)) { |
844 | { |
994 | LOG(llevError,"update_object() called for object out of map!\n"); |
845 | LOG (llevError, "update_object() called for object out of map!\n"); |
995 | #ifdef MANY_CORES |
846 | #ifdef MANY_CORES |
996 | abort(); |
847 | abort (); |
997 | #endif |
848 | #endif |
998 | return; |
849 | return; |
999 | } |
|
|
1000 | |
850 | } |
|
|
851 | |
1001 | flags = GET_MAP_FLAGS(op->map, op->x, op->y); |
852 | flags = GET_MAP_FLAGS (op->map, op->x, op->y); |
1002 | SET_MAP_FLAGS(op->map, op->x, op->y, flags | P_NEED_UPDATE); |
853 | SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE); |
1003 | move_slow = GET_MAP_MOVE_SLOW(op->map, op->x, op->y); |
854 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
1004 | move_on = GET_MAP_MOVE_ON(op->map, op->x, op->y); |
855 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
1005 | move_block = GET_MAP_MOVE_BLOCK(op->map, op->x, op->y); |
856 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
1006 | move_off = GET_MAP_MOVE_OFF(op->map, op->x, op->y); |
857 | move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y); |
1007 | |
858 | |
1008 | if (action == UP_OBJ_INSERT) { |
859 | if (action == UP_OBJ_INSERT) |
|
|
860 | { |
1009 | if (QUERY_FLAG(op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) |
861 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) |
1010 | update_now=1; |
862 | update_now = 1; |
1011 | |
863 | |
1012 | if (QUERY_FLAG(op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) |
864 | if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) |
1013 | update_now=1; |
865 | update_now = 1; |
1014 | |
866 | |
1015 | if (QUERY_FLAG(op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) |
867 | if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) |
1016 | update_now=1; |
868 | update_now = 1; |
1017 | |
869 | |
1018 | if (QUERY_FLAG(op, FLAG_ALIVE) && !(flags & P_IS_ALIVE)) |
870 | if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE)) |
1019 | update_now=1; |
871 | update_now = 1; |
1020 | |
872 | |
|
|
873 | if (op->type == SAFE_GROUND && !(flags & P_SAFE)) |
|
|
874 | update_now = 1; |
|
|
875 | |
1021 | if ((move_on | op->move_on) != move_on) update_now=1; |
876 | if ((move_on | op->move_on) != move_on) |
|
|
877 | update_now = 1; |
|
|
878 | |
1022 | if ((move_off | op->move_off) != move_off) update_now=1; |
879 | if ((move_off | op->move_off) != move_off) |
|
|
880 | update_now = 1; |
|
|
881 | |
1023 | /* This isn't perfect, but I don't expect a lot of objects to |
882 | /* This isn't perfect, but I don't expect a lot of objects to |
1024 | * to have move_allow right now. |
883 | * to have move_allow right now. |
1025 | */ |
884 | */ |
1026 | if (((move_block | op->move_block) & ~op->move_allow) != move_block) |
885 | if (((move_block | op->move_block) & ~op->move_allow) != move_block) |
1027 | update_now=1; |
886 | update_now = 1; |
|
|
887 | |
1028 | if ((move_slow | op->move_slow) != move_slow) update_now=1; |
888 | if ((move_slow | op->move_slow) != move_slow) |
|
|
889 | update_now = 1; |
1029 | } |
890 | } |
1030 | /* if the object is being removed, we can't make intelligent |
891 | /* if the object is being removed, we can't make intelligent |
1031 | * decisions, because remove_ob can't really pass the object |
892 | * decisions, because remove_ob can't really pass the object |
1032 | * that is being removed. |
893 | * that is being removed. |
1033 | */ |
894 | */ |
1034 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) { |
895 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
1035 | update_now=1; |
896 | { |
|
|
897 | update_now = 1; |
|
|
898 | } |
1036 | } else if (action == UP_OBJ_FACE) { |
899 | else if (action == UP_OBJ_FACE) |
|
|
900 | { |
1037 | /* Nothing to do for that case */ |
901 | /* Nothing to do for that case */ |
|
|
902 | } |
|
|
903 | else |
1038 | } |
904 | { |
1039 | else { |
|
|
1040 | LOG(llevError,"update_object called with invalid action: %d\n", action); |
905 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
1041 | } |
906 | } |
1042 | |
907 | |
1043 | if (update_now) { |
908 | if (update_now) |
|
|
909 | { |
1044 | SET_MAP_FLAGS(op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE); |
910 | SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE); |
1045 | update_position(op->map, op->x, op->y); |
911 | update_position (op->map, op->x, op->y); |
1046 | } |
912 | } |
1047 | |
913 | |
1048 | if(op->more!=NULL) |
914 | if (op->more != NULL) |
1049 | update_object(op->more, action); |
915 | update_object (op->more, action); |
1050 | } |
916 | } |
1051 | |
917 | |
|
|
918 | static unordered_vector<object *> mortals; |
|
|
919 | static std::vector<object *> freed; |
|
|
920 | |
|
|
921 | void object::free_mortals () |
|
|
922 | { |
|
|
923 | for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); ) |
|
|
924 | if (!(*i)->refcount) |
|
|
925 | { |
|
|
926 | freed.push_back (*i); |
|
|
927 | mortals.erase (i); |
|
|
928 | } |
|
|
929 | else |
|
|
930 | ++i; |
|
|
931 | } |
|
|
932 | |
|
|
933 | object::object () |
|
|
934 | { |
|
|
935 | SET_FLAG (this, FLAG_REMOVED); |
|
|
936 | |
|
|
937 | expmul = 1.0; |
|
|
938 | face = blank_face; |
|
|
939 | attacked_by_count = -1; |
|
|
940 | } |
|
|
941 | |
|
|
942 | object::~object () |
|
|
943 | { |
|
|
944 | free_key_values (this); |
|
|
945 | } |
|
|
946 | |
|
|
947 | void object::link () |
|
|
948 | { |
|
|
949 | count = ++ob_count; |
|
|
950 | |
|
|
951 | prev = 0; |
|
|
952 | next = objects; |
|
|
953 | |
|
|
954 | if (objects) |
|
|
955 | objects->prev = this; |
|
|
956 | |
|
|
957 | objects = this; |
|
|
958 | } |
|
|
959 | |
|
|
960 | void object::unlink () |
|
|
961 | { |
|
|
962 | count = 0; |
|
|
963 | |
|
|
964 | /* Remove this object from the list of used objects */ |
|
|
965 | if (prev) |
|
|
966 | { |
|
|
967 | prev->next = next; |
|
|
968 | prev = 0; |
|
|
969 | } |
|
|
970 | |
|
|
971 | if (next) |
|
|
972 | { |
|
|
973 | next->prev = prev; |
|
|
974 | next = 0; |
|
|
975 | } |
|
|
976 | |
|
|
977 | if (this == objects) |
|
|
978 | objects = next; |
|
|
979 | } |
|
|
980 | |
|
|
981 | object *object::create () |
|
|
982 | { |
|
|
983 | object *op; |
|
|
984 | |
|
|
985 | if (freed.empty ()) |
|
|
986 | op = new object; |
|
|
987 | else |
|
|
988 | { |
|
|
989 | // highly annoying, but the only way to get it stable right now |
|
|
990 | op = freed.back (); freed.pop_back (); |
|
|
991 | op->~object (); |
|
|
992 | new ((void *)op) object; |
|
|
993 | } |
|
|
994 | |
|
|
995 | op->link (); |
|
|
996 | return op; |
|
|
997 | } |
1052 | |
998 | |
1053 | /* |
999 | /* |
1054 | * free_object() frees everything allocated by an object, removes |
1000 | * free_object() frees everything allocated by an object, removes |
1055 | * it from the list of used objects, and puts it on the list of |
1001 | * it from the list of used objects, and puts it on the list of |
1056 | * free objects. The IS_FREED() flag is set in the object. |
1002 | * free objects. The IS_FREED() flag is set in the object. |
… | |
… | |
1058 | * this function to succeed. |
1004 | * this function to succeed. |
1059 | * |
1005 | * |
1060 | * If free_inventory is set, free inventory as well. Else drop items in |
1006 | * If free_inventory is set, free inventory as well. Else drop items in |
1061 | * inventory to the ground. |
1007 | * inventory to the ground. |
1062 | */ |
1008 | */ |
1063 | |
1009 | void object::free (bool free_inventory) |
1064 | void free_object(object *ob) { |
1010 | { |
1065 | free_object2(ob, 0); |
|
|
1066 | } |
|
|
1067 | void free_object2(object *ob, int free_inventory) { |
|
|
1068 | object *tmp,*op; |
|
|
1069 | |
|
|
1070 | ob->clear (); |
|
|
1071 | |
|
|
1072 | if (!QUERY_FLAG(ob,FLAG_REMOVED)) { |
1011 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
|
|
1012 | { |
1073 | LOG(llevDebug,"Free object called with non removed object\n"); |
1013 | LOG (llevDebug, "Free object called with non removed object\n"); |
1074 | dump_object(ob); |
1014 | dump_object (this); |
1075 | #ifdef MANY_CORES |
1015 | #ifdef MANY_CORES |
1076 | abort(); |
1016 | abort (); |
1077 | #endif |
1017 | #endif |
1078 | } |
1018 | } |
|
|
1019 | |
1079 | if(QUERY_FLAG(ob,FLAG_FRIENDLY)) { |
1020 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
|
|
1021 | { |
1080 | LOG(llevMonster,"Warning: tried to free friendly object.\n"); |
1022 | LOG (llevMonster, "Warning: tried to free friendly object.\n"); |
1081 | remove_friendly_object(ob); |
1023 | remove_friendly_object (this); |
1082 | } |
1024 | } |
|
|
1025 | |
1083 | if(QUERY_FLAG(ob,FLAG_FREED)) { |
1026 | if (QUERY_FLAG (this, FLAG_FREED)) |
1084 | dump_object(ob); |
1027 | { |
|
|
1028 | dump_object (this); |
1085 | LOG(llevError,"Trying to free freed object.\n%s\n",errmsg); |
1029 | LOG (llevError, "Trying to free freed object.\n%s\n", errmsg); |
1086 | return; |
1030 | return; |
|
|
1031 | } |
|
|
1032 | |
|
|
1033 | if (more) |
1087 | } |
1034 | { |
1088 | if(ob->more!=NULL) { |
1035 | more->free (free_inventory); |
1089 | free_object2(ob->more, free_inventory); |
1036 | more = 0; |
1090 | ob->more=NULL; |
1037 | } |
|
|
1038 | |
|
|
1039 | if (inv) |
1091 | } |
1040 | { |
1092 | if (ob->inv) { |
|
|
1093 | /* Only if the space blocks everything do we not process - |
1041 | /* Only if the space blocks everything do we not process - |
1094 | * if some form of movemnt is allowed, let objects |
1042 | * if some form of movement is allowed, let objects |
1095 | * drop on that space. |
1043 | * drop on that space. |
1096 | */ |
1044 | */ |
1097 | if (free_inventory || ob->map==NULL || ob->map->in_memory!=MAP_IN_MEMORY || |
1045 | if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)) |
1098 | (GET_MAP_MOVE_BLOCK(ob->map, ob->x, ob->y) == MOVE_ALL)) |
1046 | { |
1099 | { |
1047 | object * |
1100 | op=ob->inv; |
1048 | op = inv; |
1101 | while(op!=NULL) { |
1049 | |
1102 | tmp=op->below; |
1050 | while (op) |
1103 | remove_ob(op); |
1051 | { |
1104 | free_object2(op, free_inventory); |
1052 | object * |
1105 | op=tmp; |
1053 | tmp = op->below; |
|
|
1054 | |
|
|
1055 | remove_ob (op); |
|
|
1056 | op->free (free_inventory); |
|
|
1057 | op = tmp; |
|
|
1058 | } |
|
|
1059 | } |
|
|
1060 | else |
|
|
1061 | { /* Put objects in inventory onto this space */ |
|
|
1062 | object * |
|
|
1063 | op = inv; |
|
|
1064 | |
|
|
1065 | while (op) |
|
|
1066 | { |
|
|
1067 | object * |
|
|
1068 | tmp = op->below; |
|
|
1069 | |
|
|
1070 | remove_ob (op); |
|
|
1071 | |
|
|
1072 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
|
|
1073 | || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
|
|
1074 | free_object (op); |
|
|
1075 | else |
|
|
1076 | { |
|
|
1077 | op->x = x; |
|
|
1078 | op->y = y; |
|
|
1079 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
|
|
1080 | } |
|
|
1081 | |
|
|
1082 | op = tmp; |
|
|
1083 | } |
|
|
1084 | } |
1106 | } |
1085 | } |
1107 | } |
1086 | |
1108 | else { /* Put objects in inventory onto this space */ |
1087 | clear_owner (this); |
1109 | op=ob->inv; |
1088 | |
1110 | while(op!=NULL) { |
|
|
1111 | tmp=op->below; |
|
|
1112 | remove_ob(op); |
|
|
1113 | if(QUERY_FLAG(op,FLAG_STARTEQUIP)||QUERY_FLAG(op,FLAG_NO_DROP) || |
|
|
1114 | op->type==RUNE || op->type==TRAP || QUERY_FLAG(op,FLAG_IS_A_TEMPLATE)) |
|
|
1115 | free_object(op); |
|
|
1116 | else { |
|
|
1117 | op->x=ob->x; |
|
|
1118 | op->y=ob->y; |
|
|
1119 | insert_ob_in_map(op,ob->map,NULL,0); /* Insert in same map as the envir */ |
|
|
1120 | } |
|
|
1121 | op=tmp; |
|
|
1122 | } |
|
|
1123 | } |
|
|
1124 | } |
|
|
1125 | /* Remove object from the active list */ |
1089 | /* Remove object from the active list */ |
1126 | ob->speed = 0; |
1090 | speed = 0; |
1127 | update_ob_speed(ob); |
1091 | update_ob_speed (this); |
1128 | |
1092 | |
|
|
1093 | unlink (); |
|
|
1094 | |
1129 | SET_FLAG(ob, FLAG_FREED); |
1095 | SET_FLAG (this, FLAG_FREED); |
1130 | ob->count = 0; |
|
|
1131 | |
1096 | |
1132 | /* Remove this object from the list of used objects */ |
1097 | mortals.push_back (this); |
1133 | if(ob->prev==NULL) { |
|
|
1134 | objects=ob->next; |
|
|
1135 | if(objects!=NULL) |
|
|
1136 | objects->prev=NULL; |
|
|
1137 | } |
|
|
1138 | else { |
|
|
1139 | ob->prev->next=ob->next; |
|
|
1140 | if(ob->next!=NULL) |
|
|
1141 | ob->next->prev=ob->prev; |
|
|
1142 | } |
|
|
1143 | |
|
|
1144 | if(ob->name!=NULL) FREE_AND_CLEAR_STR(ob->name); |
|
|
1145 | if(ob->name_pl!=NULL) FREE_AND_CLEAR_STR(ob->name_pl); |
|
|
1146 | if(ob->title!=NULL) FREE_AND_CLEAR_STR(ob->title); |
|
|
1147 | if(ob->race!=NULL) FREE_AND_CLEAR_STR(ob->race); |
|
|
1148 | if(ob->slaying!=NULL) FREE_AND_CLEAR_STR(ob->slaying); |
|
|
1149 | if(ob->skill!=NULL) FREE_AND_CLEAR_STR(ob->skill); |
|
|
1150 | if(ob->lore!=NULL) FREE_AND_CLEAR_STR(ob->lore); |
|
|
1151 | if(ob->msg!=NULL) FREE_AND_CLEAR_STR(ob->msg); |
|
|
1152 | if(ob->materialname!=NULL) FREE_AND_CLEAR_STR(ob->materialname); |
|
|
1153 | |
|
|
1154 | |
|
|
1155 | /* Why aren't events freed? */ |
|
|
1156 | free_key_values(ob); |
|
|
1157 | |
|
|
1158 | #if 0 /* MEMORY_DEBUG*/ |
|
|
1159 | /* This is a nice idea. Unfortunately, a lot of the code in crossfire |
|
|
1160 | * presumes the freed_object will stick around for at least a little |
|
|
1161 | * bit |
|
|
1162 | */ |
|
|
1163 | /* this is necessary so that memory debugging programs will |
|
|
1164 | * be able to accurately report source of malloc. If we recycle |
|
|
1165 | * objects, then some other area may be doing the get_object |
|
|
1166 | * and not freeing it, but the original one that malloc'd the |
|
|
1167 | * object will get the blame. |
|
|
1168 | */ |
|
|
1169 | free(ob); |
|
|
1170 | #else |
|
|
1171 | |
|
|
1172 | /* Now link it with the free_objects list: */ |
|
|
1173 | ob->prev=NULL; |
|
|
1174 | ob->next=free_objects; |
|
|
1175 | if(free_objects!=NULL) |
|
|
1176 | free_objects->prev=ob; |
|
|
1177 | free_objects=ob; |
|
|
1178 | nroffreeobjects++; |
|
|
1179 | #endif |
|
|
1180 | } |
|
|
1181 | |
|
|
1182 | /* |
|
|
1183 | * count_free() returns the number of objects on the list of free objects. |
|
|
1184 | */ |
|
|
1185 | |
|
|
1186 | int count_free(void) { |
|
|
1187 | int i=0; |
|
|
1188 | object *tmp=free_objects; |
|
|
1189 | while(tmp!=NULL) |
|
|
1190 | tmp=tmp->next, i++; |
|
|
1191 | return i; |
|
|
1192 | } |
|
|
1193 | |
|
|
1194 | /* |
|
|
1195 | * count_used() returns the number of objects on the list of used objects. |
|
|
1196 | */ |
|
|
1197 | |
|
|
1198 | int count_used(void) { |
|
|
1199 | int i=0; |
|
|
1200 | object *tmp=objects; |
|
|
1201 | while(tmp!=NULL) |
|
|
1202 | tmp=tmp->next, i++; |
|
|
1203 | return i; |
|
|
1204 | } |
|
|
1205 | |
|
|
1206 | /* |
|
|
1207 | * count_active() returns the number of objects on the list of active objects. |
|
|
1208 | */ |
|
|
1209 | |
|
|
1210 | int count_active(void) { |
|
|
1211 | int i=0; |
|
|
1212 | object *tmp=active_objects; |
|
|
1213 | while(tmp!=NULL) |
|
|
1214 | tmp=tmp->active_next, i++; |
|
|
1215 | return i; |
|
|
1216 | } |
1098 | } |
1217 | |
1099 | |
1218 | /* |
1100 | /* |
1219 | * sub_weight() recursively (outwards) subtracts a number from the |
1101 | * sub_weight() recursively (outwards) subtracts a number from the |
1220 | * weight of an object (and what is carried by it's environment(s)). |
1102 | * weight of an object (and what is carried by it's environment(s)). |
1221 | */ |
1103 | */ |
1222 | |
1104 | |
|
|
1105 | void |
1223 | void sub_weight (object *op, signed long weight) { |
1106 | sub_weight (object *op, signed long weight) |
|
|
1107 | { |
1224 | while (op != NULL) { |
1108 | while (op != NULL) |
|
|
1109 | { |
1225 | if (op->type == CONTAINER) { |
1110 | if (op->type == CONTAINER) |
|
|
1111 | { |
1226 | weight=(signed long)(weight*(100-op->stats.Str)/100); |
1112 | weight = (signed long) (weight * (100 - op->stats.Str) / 100); |
1227 | } |
1113 | } |
1228 | op->carrying-=weight; |
1114 | op->carrying -= weight; |
1229 | op = op->env; |
1115 | op = op->env; |
1230 | } |
1116 | } |
1231 | } |
1117 | } |
1232 | |
1118 | |
1233 | /* remove_ob(op): |
1119 | /* remove_ob(op): |
1234 | * This function removes the object op from the linked list of objects |
1120 | * This function removes the object op from the linked list of objects |
1235 | * which it is currently tied to. When this function is done, the |
1121 | * which it is currently tied to. When this function is done, the |
… | |
… | |
1237 | * environment, the x and y coordinates will be updated to |
1123 | * environment, the x and y coordinates will be updated to |
1238 | * the previous environment. |
1124 | * the previous environment. |
1239 | * Beware: This function is called from the editor as well! |
1125 | * Beware: This function is called from the editor as well! |
1240 | */ |
1126 | */ |
1241 | |
1127 | |
|
|
1128 | void |
1242 | void remove_ob(object *op) { |
1129 | remove_ob (object *op) |
|
|
1130 | { |
1243 | object *tmp,*last=NULL; |
1131 | object *tmp, *last = NULL; |
1244 | object *otmp; |
1132 | object *otmp; |
|
|
1133 | |
1245 | tag_t tag; |
1134 | tag_t tag; |
1246 | int check_walk_off; |
1135 | int check_walk_off; |
1247 | mapstruct *m; |
1136 | mapstruct *m; |
|
|
1137 | |
1248 | sint16 x,y; |
1138 | sint16 x, y; |
1249 | |
|
|
1250 | |
1139 | |
1251 | if(QUERY_FLAG(op,FLAG_REMOVED)) { |
1140 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1141 | { |
1252 | dump_object(op); |
1142 | dump_object (op); |
1253 | LOG(llevError,"Trying to remove removed object.\n%s\n",errmsg); |
1143 | LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg); |
1254 | |
1144 | |
1255 | /* Changed it to always dump core in this case. As has been learned |
1145 | /* Changed it to always dump core in this case. As has been learned |
1256 | * in the past, trying to recover from errors almost always |
1146 | * in the past, trying to recover from errors almost always |
1257 | * make things worse, and this is a real error here - something |
1147 | * make things worse, and this is a real error here - something |
1258 | * that should not happen. |
1148 | * that should not happen. |
1259 | * Yes, if this was a mission critical app, trying to do something |
1149 | * Yes, if this was a mission critical app, trying to do something |
1260 | * to recover may make sense, but that is because failure of the app |
1150 | * to recover may make sense, but that is because failure of the app |
1261 | * may have other disastrous problems. Cf runs out of a script |
1151 | * may have other disastrous problems. Cf runs out of a script |
1262 | * so is easily enough restarted without any real problems. |
1152 | * so is easily enough restarted without any real problems. |
1263 | * MSW 2001-07-01 |
1153 | * MSW 2001-07-01 |
1264 | */ |
1154 | */ |
1265 | abort(); |
1155 | abort (); |
1266 | } |
1156 | } |
|
|
1157 | |
1267 | if(op->more!=NULL) |
1158 | if (op->more != NULL) |
1268 | remove_ob(op->more); |
1159 | remove_ob (op->more); |
1269 | |
1160 | |
1270 | SET_FLAG(op, FLAG_REMOVED); |
1161 | SET_FLAG (op, FLAG_REMOVED); |
1271 | |
1162 | |
1272 | /* |
1163 | /* |
1273 | * In this case, the object to be removed is in someones |
1164 | * In this case, the object to be removed is in someones |
1274 | * inventory. |
1165 | * inventory. |
1275 | */ |
1166 | */ |
1276 | if(op->env!=NULL) { |
1167 | if (op->env != NULL) |
|
|
1168 | { |
1277 | if(op->nrof) |
1169 | if (op->nrof) |
1278 | sub_weight(op->env, op->weight*op->nrof); |
1170 | sub_weight (op->env, op->weight * op->nrof); |
1279 | else |
1171 | else |
1280 | sub_weight(op->env, op->weight+op->carrying); |
1172 | sub_weight (op->env, op->weight + op->carrying); |
1281 | |
1173 | |
1282 | /* NO_FIX_PLAYER is set when a great many changes are being |
1174 | /* NO_FIX_PLAYER is set when a great many changes are being |
1283 | * made to players inventory. If set, avoiding the call |
1175 | * made to players inventory. If set, avoiding the call |
1284 | * to save cpu time. |
1176 | * to save cpu time. |
1285 | */ |
1177 | */ |
1286 | if ((otmp=is_player_inv(op->env))!=NULL && otmp->contr && |
1178 | if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1287 | !QUERY_FLAG(otmp,FLAG_NO_FIX_PLAYER)) |
|
|
1288 | fix_player(otmp); |
1179 | fix_player (otmp); |
1289 | |
1180 | |
1290 | if(op->above!=NULL) |
1181 | if (op->above != NULL) |
1291 | op->above->below=op->below; |
1182 | op->above->below = op->below; |
1292 | else |
1183 | else |
1293 | op->env->inv=op->below; |
1184 | op->env->inv = op->below; |
1294 | |
1185 | |
1295 | if(op->below!=NULL) |
1186 | if (op->below != NULL) |
1296 | op->below->above=op->above; |
1187 | op->below->above = op->above; |
1297 | |
1188 | |
1298 | /* we set up values so that it could be inserted into |
1189 | /* we set up values so that it could be inserted into |
1299 | * the map, but we don't actually do that - it is up |
1190 | * the map, but we don't actually do that - it is up |
1300 | * to the caller to decide what we want to do. |
1191 | * to the caller to decide what we want to do. |
1301 | */ |
1192 | */ |
1302 | op->x=op->env->x,op->y=op->env->y; |
1193 | op->x = op->env->x, op->y = op->env->y; |
1303 | op->ox=op->x,op->oy=op->y; |
|
|
1304 | op->map=op->env->map; |
1194 | op->map = op->env->map; |
1305 | op->above=NULL,op->below=NULL; |
1195 | op->above = NULL, op->below = NULL; |
1306 | op->env=NULL; |
1196 | op->env = NULL; |
1307 | return; |
1197 | return; |
1308 | } |
1198 | } |
1309 | |
1199 | |
1310 | /* If we get here, we are removing it from a map */ |
1200 | /* If we get here, we are removing it from a map */ |
1311 | if (op->map == NULL) return; |
1201 | if (op->map == NULL) |
|
|
1202 | return; |
1312 | |
1203 | |
1313 | x = op->x; |
1204 | x = op->x; |
1314 | y = op->y; |
1205 | y = op->y; |
1315 | m = get_map_from_coord(op->map, &x, &y); |
1206 | m = get_map_from_coord (op->map, &x, &y); |
1316 | |
1207 | |
1317 | if (!m) { |
1208 | if (!m) |
|
|
1209 | { |
1318 | LOG(llevError,"remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", |
1210 | LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", |
1319 | op->map->path, op->x, op->y); |
1211 | op->map->path, op->x, op->y); |
1320 | /* in old days, we used to set x and y to 0 and continue. |
1212 | /* in old days, we used to set x and y to 0 and continue. |
1321 | * it seems if we get into this case, something is probablye |
1213 | * it seems if we get into this case, something is probablye |
1322 | * screwed up and should be fixed. |
1214 | * screwed up and should be fixed. |
1323 | */ |
1215 | */ |
1324 | abort(); |
1216 | abort (); |
1325 | } |
1217 | } |
1326 | if (op->map != m) { |
1218 | if (op->map != m) |
|
|
1219 | { |
1327 | LOG(llevDebug,"remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", |
1220 | LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n", |
1328 | op->map->path, m->path, op->x, op->y, x, y); |
1221 | op->map->path, m->path, op->x, op->y, x, y); |
1329 | } |
1222 | } |
1330 | |
1223 | |
1331 | /* Re did the following section of code - it looks like it had |
1224 | /* Re did the following section of code - it looks like it had |
1332 | * lots of logic for things we no longer care about |
1225 | * lots of logic for things we no longer care about |
1333 | */ |
1226 | */ |
1334 | |
1227 | |
1335 | /* link the object above us */ |
1228 | /* link the object above us */ |
1336 | if (op->above) |
1229 | if (op->above) |
1337 | op->above->below=op->below; |
1230 | op->above->below = op->below; |
1338 | else |
1231 | else |
1339 | SET_MAP_TOP(m,x,y,op->below); /* we were top, set new top */ |
1232 | SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ |
1340 | |
1233 | |
1341 | /* Relink the object below us, if there is one */ |
1234 | /* Relink the object below us, if there is one */ |
1342 | if(op->below) { |
1235 | if (op->below) |
1343 | op->below->above=op->above; |
1236 | op->below->above = op->above; |
1344 | } else { |
1237 | else |
|
|
1238 | { |
1345 | /* Nothing below, which means we need to relink map object for this space |
1239 | /* Nothing below, which means we need to relink map object for this space |
1346 | * use translated coordinates in case some oddness with map tiling is |
1240 | * use translated coordinates in case some oddness with map tiling is |
1347 | * evident |
1241 | * evident |
1348 | */ |
1242 | */ |
1349 | if(GET_MAP_OB(m,x,y)!=op) { |
1243 | if (GET_MAP_OB (m, x, y) != op) |
|
|
1244 | { |
1350 | dump_object(op); |
1245 | dump_object (op); |
1351 | LOG(llevError,"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg); |
1246 | 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", |
|
|
1247 | errmsg); |
1352 | dump_object(GET_MAP_OB(m,x,y)); |
1248 | dump_object (GET_MAP_OB (m, x, y)); |
1353 | LOG(llevError,"%s\n",errmsg); |
1249 | LOG (llevError, "%s\n", errmsg); |
1354 | } |
1250 | } |
|
|
1251 | |
1355 | SET_MAP_OB(m,x,y,op->above); /* goes on above it. */ |
1252 | SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ |
1356 | } |
1253 | } |
1357 | op->above=NULL; |
1254 | |
|
|
1255 | op->above = NULL; |
1358 | op->below=NULL; |
1256 | op->below = NULL; |
1359 | |
1257 | |
1360 | if (op->map->in_memory == MAP_SAVING) |
1258 | if (op->map->in_memory == MAP_SAVING) |
1361 | return; |
1259 | return; |
1362 | |
1260 | |
1363 | tag = op->count; |
1261 | tag = op->count; |
1364 | check_walk_off = ! QUERY_FLAG (op, FLAG_NO_APPLY); |
1262 | check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); |
|
|
1263 | |
1365 | for(tmp=GET_MAP_OB(m,x,y);tmp!=NULL;tmp=tmp->above) { |
1264 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
|
|
1265 | { |
1366 | /* No point updating the players look faces if he is the object |
1266 | /* No point updating the players look faces if he is the object |
1367 | * being removed. |
1267 | * being removed. |
1368 | */ |
1268 | */ |
1369 | |
1269 | |
1370 | if(tmp->type==PLAYER && tmp!=op) { |
1270 | if (tmp->type == PLAYER && tmp != op) |
|
|
1271 | { |
1371 | /* If a container that the player is currently using somehow gets |
1272 | /* If a container that the player is currently using somehow gets |
1372 | * removed (most likely destroyed), update the player view |
1273 | * removed (most likely destroyed), update the player view |
1373 | * appropriately. |
1274 | * appropriately. |
1374 | */ |
1275 | */ |
1375 | if (tmp->container==op) { |
1276 | if (tmp->container == op) |
|
|
1277 | { |
1376 | CLEAR_FLAG(op, FLAG_APPLIED); |
1278 | CLEAR_FLAG (op, FLAG_APPLIED); |
1377 | tmp->container=NULL; |
1279 | tmp->container = NULL; |
1378 | } |
1280 | } |
|
|
1281 | |
1379 | tmp->contr->socket.update_look=1; |
1282 | tmp->contr->socket.update_look = 1; |
1380 | } |
1283 | } |
1381 | /* See if player moving off should effect something */ |
1284 | /* See if player moving off should effect something */ |
1382 | if (check_walk_off && ((op->move_type & tmp->move_off) && |
1285 | if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1383 | (op->move_type & ~tmp->move_off & ~tmp->move_block)==0)) { |
1286 | { |
1384 | |
|
|
1385 | move_apply(tmp, op, NULL); |
1287 | move_apply (tmp, op, NULL); |
|
|
1288 | |
1386 | if (was_destroyed (op, tag)) { |
1289 | if (was_destroyed (op, tag)) |
1387 | LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " |
1290 | { |
1388 | "leaving object\n", tmp->name, tmp->arch->name); |
1291 | LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); |
1389 | } |
1292 | } |
1390 | } |
1293 | } |
1391 | |
1294 | |
1392 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1295 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1393 | |
1296 | |
1394 | if(tmp->above == tmp) |
1297 | if (tmp->above == tmp) |
1395 | tmp->above = NULL; |
1298 | tmp->above = NULL; |
1396 | last=tmp; |
1299 | |
|
|
1300 | last = tmp; |
1397 | } |
1301 | } |
|
|
1302 | |
1398 | /* last == NULL of there are no objects on this space */ |
1303 | /* last == NULL of there are no objects on this space */ |
1399 | if (last==NULL) { |
1304 | if (last == NULL) |
|
|
1305 | { |
1400 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1306 | /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, |
1401 | * we could preserve the flags (GET_MAP_FLAGS), but update_position figures |
1307 | * we could preserve the flags (GET_MAP_FLAGS), but update_position figures |
1402 | * those out anyways, and if there are any flags set right now, they won't |
1308 | * those out anyways, and if there are any flags set right now, they won't |
1403 | * be correct anyways. |
1309 | * be correct anyways. |
1404 | */ |
1310 | */ |
1405 | SET_MAP_FLAGS(op->map, op->x, op->y, P_NEED_UPDATE); |
1311 | SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); |
1406 | update_position(op->map, op->x, op->y); |
1312 | update_position (op->map, op->x, op->y); |
1407 | } |
1313 | } |
1408 | else |
1314 | else |
1409 | update_object(last, UP_OBJ_REMOVE); |
1315 | update_object (last, UP_OBJ_REMOVE); |
1410 | |
1316 | |
1411 | if(QUERY_FLAG(op,FLAG_BLOCKSVIEW)|| (op->glow_radius != 0)) |
1317 | if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) |
1412 | update_all_los(op->map, op->x, op->y); |
1318 | update_all_los (op->map, op->x, op->y); |
1413 | |
|
|
1414 | } |
1319 | } |
1415 | |
1320 | |
1416 | /* |
1321 | /* |
1417 | * merge_ob(op,top): |
1322 | * merge_ob(op,top): |
1418 | * |
1323 | * |
… | |
… | |
1420 | * merges op to the first matching object. |
1325 | * merges op to the first matching object. |
1421 | * If top is NULL, it is calculated. |
1326 | * If top is NULL, it is calculated. |
1422 | * Returns pointer to object if it succeded in the merge, otherwise NULL |
1327 | * Returns pointer to object if it succeded in the merge, otherwise NULL |
1423 | */ |
1328 | */ |
1424 | |
1329 | |
|
|
1330 | object * |
1425 | object *merge_ob(object *op, object *top) { |
1331 | merge_ob (object *op, object *top) |
|
|
1332 | { |
1426 | if(!op->nrof) |
1333 | if (!op->nrof) |
1427 | return 0; |
1334 | return 0; |
1428 | if(top==NULL) |
1335 | if (top == NULL) |
1429 | for(top=op;top!=NULL&&top->above!=NULL;top=top->above); |
1336 | for (top = op; top != NULL && top->above != NULL; top = top->above); |
1430 | for(;top!=NULL;top=top->below) { |
1337 | for (; top != NULL; top = top->below) |
|
|
1338 | { |
1431 | if(top==op) |
1339 | if (top == op) |
1432 | continue; |
1340 | continue; |
1433 | if (CAN_MERGE(op,top)) |
1341 | if (CAN_MERGE (op, top)) |
1434 | { |
1342 | { |
1435 | top->nrof+=op->nrof; |
1343 | top->nrof += op->nrof; |
|
|
1344 | |
1436 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1345 | /* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ |
1437 | op->weight = 0; /* Don't want any adjustements now */ |
1346 | op->weight = 0; /* Don't want any adjustements now */ |
1438 | remove_ob(op); |
1347 | remove_ob (op); |
1439 | free_object(op); |
1348 | free_object (op); |
1440 | return top; |
1349 | return top; |
1441 | } |
1350 | } |
1442 | } |
1351 | } |
1443 | return NULL; |
1352 | return NULL; |
1444 | } |
1353 | } |
1445 | |
1354 | |
1446 | /* |
1355 | /* |
1447 | * same as insert_ob_in_map except it handle separate coordinates and do a clean |
1356 | * same as insert_ob_in_map except it handle separate coordinates and do a clean |
1448 | * job preparing multi-part monsters |
1357 | * job preparing multi-part monsters |
1449 | */ |
1358 | */ |
|
|
1359 | object * |
1450 | object *insert_ob_in_map_at(object *op, mapstruct *m, object *originator, int flag, int x, int y){ |
1360 | insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) |
1451 | object* tmp; |
1361 | { |
|
|
1362 | object * |
|
|
1363 | tmp; |
|
|
1364 | |
1452 | if (op->head) |
1365 | if (op->head) |
1453 | op=op->head; |
1366 | op = op->head; |
1454 | for (tmp=op;tmp;tmp=tmp->more){ |
1367 | for (tmp = op; tmp; tmp = tmp->more) |
|
|
1368 | { |
1455 | tmp->x=x+tmp->arch->clone.x; |
1369 | tmp->x = x + tmp->arch->clone.x; |
1456 | tmp->y=y+tmp->arch->clone.y; |
1370 | tmp->y = y + tmp->arch->clone.y; |
1457 | } |
1371 | } |
1458 | return insert_ob_in_map (op, m, originator, flag); |
1372 | return insert_ob_in_map (op, m, originator, flag); |
1459 | } |
1373 | } |
1460 | |
1374 | |
1461 | /* |
1375 | /* |
1462 | * insert_ob_in_map (op, map, originator, flag): |
1376 | * insert_ob_in_map (op, map, originator, flag): |
1463 | * This function inserts the object in the two-way linked list |
1377 | * This function inserts the object in the two-way linked list |
… | |
… | |
1477 | * new object if 'op' was merged with other object |
1391 | * new object if 'op' was merged with other object |
1478 | * NULL if 'op' was destroyed |
1392 | * NULL if 'op' was destroyed |
1479 | * just 'op' otherwise |
1393 | * just 'op' otherwise |
1480 | */ |
1394 | */ |
1481 | |
1395 | |
|
|
1396 | object * |
1482 | object *insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) |
1397 | insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) |
1483 | { |
1398 | { |
1484 | object *tmp, *top, *floor=NULL; |
1399 | object *tmp, *top, *floor = NULL; |
1485 | sint16 x,y; |
1400 | sint16 x, y; |
1486 | |
1401 | |
1487 | if (QUERY_FLAG (op, FLAG_FREED)) { |
1402 | if (QUERY_FLAG (op, FLAG_FREED)) |
|
|
1403 | { |
1488 | LOG (llevError, "Trying to insert freed object!\n"); |
1404 | LOG (llevError, "Trying to insert freed object!\n"); |
1489 | return NULL; |
1405 | return NULL; |
|
|
1406 | } |
|
|
1407 | |
|
|
1408 | if (m == NULL) |
1490 | } |
1409 | { |
1491 | if(m==NULL) { |
|
|
1492 | dump_object(op); |
1410 | dump_object (op); |
1493 | LOG(llevError,"Trying to insert in null-map!\n%s\n",errmsg); |
1411 | LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); |
1494 | return op; |
1412 | return op; |
1495 | } |
1413 | } |
|
|
1414 | |
1496 | if(out_of_map(m,op->x,op->y)) { |
1415 | if (out_of_map (m, op->x, op->y)) |
|
|
1416 | { |
1497 | dump_object(op); |
1417 | dump_object (op); |
1498 | LOG(llevError,"Trying to insert object outside the map.\n%s\n", errmsg); |
1418 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); |
1499 | #ifdef MANY_CORES |
1419 | #ifdef MANY_CORES |
1500 | /* Better to catch this here, as otherwise the next use of this object |
1420 | /* Better to catch this here, as otherwise the next use of this object |
1501 | * is likely to cause a crash. Better to find out where it is getting |
1421 | * is likely to cause a crash. Better to find out where it is getting |
1502 | * improperly inserted. |
1422 | * improperly inserted. |
1503 | */ |
1423 | */ |
1504 | abort(); |
1424 | abort (); |
1505 | #endif |
1425 | #endif |
1506 | return op; |
1426 | return op; |
1507 | } |
1427 | } |
|
|
1428 | |
1508 | if(!QUERY_FLAG(op,FLAG_REMOVED)) { |
1429 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1430 | { |
1509 | dump_object(op); |
1431 | dump_object (op); |
1510 | LOG(llevError,"Trying to insert (map) inserted object.\n%s\n", errmsg); |
1432 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); |
1511 | return op; |
1433 | return op; |
1512 | } |
1434 | } |
|
|
1435 | |
1513 | if(op->more!=NULL) { |
1436 | if (op->more != NULL) |
|
|
1437 | { |
1514 | /* The part may be on a different map. */ |
1438 | /* The part may be on a different map. */ |
1515 | |
1439 | |
1516 | object *more = op->more; |
1440 | object *more = op->more; |
1517 | |
1441 | |
1518 | /* We really need the caller to normalize coordinates - if |
1442 | /* We really need the caller to normalize coordinates - if |
1519 | * we set the map, that doesn't work if the location is within |
1443 | * we set the map, that doesn't work if the location is within |
1520 | * a map and this is straddling an edge. So only if coordinate |
1444 | * a map and this is straddling an edge. So only if coordinate |
1521 | * is clear wrong do we normalize it. |
1445 | * is clear wrong do we normalize it. |
1522 | */ |
1446 | */ |
1523 | if (OUT_OF_REAL_MAP(more->map, more->x, more->y)) { |
1447 | if (OUT_OF_REAL_MAP (more->map, more->x, more->y)) |
1524 | /* Debugging information so you can see the last coordinates this object had */ |
|
|
1525 | more->ox = more->x; |
|
|
1526 | more->oy = more->y; |
|
|
1527 | more->map = get_map_from_coord(m, &more->x, &more->y); |
1448 | more->map = get_map_from_coord (m, &more->x, &more->y); |
1528 | } else if (!more->map) { |
1449 | else if (!more->map) |
|
|
1450 | { |
1529 | /* For backwards compatibility - when not dealing with tiled maps, |
1451 | /* For backwards compatibility - when not dealing with tiled maps, |
1530 | * more->map should always point to the parent. |
1452 | * more->map should always point to the parent. |
1531 | */ |
1453 | */ |
1532 | more->map = m; |
1454 | more->map = m; |
1533 | } |
1455 | } |
1534 | |
1456 | |
1535 | if (insert_ob_in_map(more, more->map, originator, flag) == NULL) { |
1457 | if (insert_ob_in_map (more, more->map, originator, flag) == NULL) |
|
|
1458 | { |
1536 | if ( ! op->head) |
1459 | if (!op->head) |
1537 | LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); |
1460 | LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); |
|
|
1461 | |
1538 | return NULL; |
1462 | return NULL; |
1539 | } |
1463 | } |
1540 | } |
1464 | } |
|
|
1465 | |
1541 | CLEAR_FLAG(op,FLAG_REMOVED); |
1466 | CLEAR_FLAG (op, FLAG_REMOVED); |
1542 | |
1467 | |
1543 | /* Debugging information so you can see the last coordinates this object had */ |
|
|
1544 | op->ox=op->x; |
|
|
1545 | op->oy=op->y; |
|
|
1546 | |
|
|
1547 | /* Ideally, the caller figures this out. However, it complicates a lot |
1468 | /* Ideally, the caller figures this out. However, it complicates a lot |
1548 | * of areas of callers (eg, anything that uses find_free_spot would now |
1469 | * of areas of callers (eg, anything that uses find_free_spot would now |
1549 | * need extra work |
1470 | * need extra work |
1550 | */ |
1471 | */ |
1551 | op->map=get_map_from_coord(m, &op->x, &op->y); |
1472 | op->map = get_map_from_coord (m, &op->x, &op->y); |
1552 | x = op->x; |
1473 | x = op->x; |
1553 | y = op->y; |
1474 | y = op->y; |
1554 | |
1475 | |
1555 | /* this has to be done after we translate the coordinates. |
1476 | /* this has to be done after we translate the coordinates. |
1556 | */ |
1477 | */ |
1557 | if(op->nrof && !(flag & INS_NO_MERGE)) { |
1478 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1558 | for(tmp=GET_MAP_OB(op->map,x,y);tmp!=NULL;tmp=tmp->above) |
1479 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1559 | if (CAN_MERGE(op,tmp)) { |
1480 | if (CAN_MERGE (op, tmp)) |
1560 | op->nrof+=tmp->nrof; |
1481 | { |
1561 | remove_ob(tmp); |
1482 | op->nrof += tmp->nrof; |
1562 | free_object(tmp); |
1483 | remove_ob (tmp); |
1563 | } |
1484 | free_object (tmp); |
1564 | } |
1485 | } |
1565 | |
1486 | |
1566 | CLEAR_FLAG(op,FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1487 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1567 | CLEAR_FLAG(op, FLAG_INV_LOCKED); |
1488 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
|
|
1489 | |
1568 | if (!QUERY_FLAG(op, FLAG_ALIVE)) |
1490 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
1569 | CLEAR_FLAG(op, FLAG_NO_STEAL); |
1491 | CLEAR_FLAG (op, FLAG_NO_STEAL); |
1570 | |
1492 | |
1571 | if (flag & INS_BELOW_ORIGINATOR) { |
1493 | if (flag & INS_BELOW_ORIGINATOR) |
|
|
1494 | { |
1572 | if (originator->map != op->map || originator->x != op->x || |
1495 | if (originator->map != op->map || originator->x != op->x || originator->y != op->y) |
1573 | originator->y != op->y) { |
1496 | { |
1574 | LOG(llevError,"insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1497 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1575 | abort(); |
1498 | abort (); |
1576 | } |
1499 | } |
|
|
1500 | |
1577 | op->above = originator; |
1501 | op->above = originator; |
1578 | op->below = originator->below; |
1502 | op->below = originator->below; |
1579 | if (op->below) op->below->above = op; |
1503 | |
|
|
1504 | if (op->below) |
|
|
1505 | op->below->above = op; |
|
|
1506 | else |
1580 | else SET_MAP_OB(op->map, op->x, op->y, op); |
1507 | SET_MAP_OB (op->map, op->x, op->y, op); |
|
|
1508 | |
1581 | /* since *below* originator, no need to update top */ |
1509 | /* since *below* originator, no need to update top */ |
1582 | originator->below = op; |
1510 | originator->below = op; |
1583 | } else { |
1511 | } |
|
|
1512 | else |
|
|
1513 | { |
1584 | /* If there are other objects, then */ |
1514 | /* If there are other objects, then */ |
1585 | if((! (flag & INS_MAP_LOAD)) && ((top=GET_MAP_OB(op->map,op->x,op->y))!=NULL)) { |
1515 | if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) |
|
|
1516 | { |
1586 | object *last=NULL; |
1517 | object *last = NULL; |
1587 | /* |
1518 | |
|
|
1519 | /* |
1588 | * If there are multiple objects on this space, we do some trickier handling. |
1520 | * If there are multiple objects on this space, we do some trickier handling. |
1589 | * We've already dealt with merging if appropriate. |
1521 | * We've already dealt with merging if appropriate. |
1590 | * Generally, we want to put the new object on top. But if |
1522 | * Generally, we want to put the new object on top. But if |
1591 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
1523 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
1592 | * floor, we want to insert above that and no further. |
1524 | * floor, we want to insert above that and no further. |
1593 | * Also, if there are spell objects on this space, we stop processing |
1525 | * Also, if there are spell objects on this space, we stop processing |
1594 | * once we get to them. This reduces the need to traverse over all of |
1526 | * once we get to them. This reduces the need to traverse over all of |
1595 | * them when adding another one - this saves quite a bit of cpu time |
1527 | * them when adding another one - this saves quite a bit of cpu time |
1596 | * when lots of spells are cast in one area. Currently, it is presumed |
1528 | * when lots of spells are cast in one area. Currently, it is presumed |
1597 | * that flying non pickable objects are spell objects. |
1529 | * that flying non pickable objects are spell objects. |
1598 | */ |
1530 | */ |
1599 | |
1531 | |
1600 | while (top != NULL) { |
1532 | while (top != NULL) |
1601 | if (QUERY_FLAG(top, FLAG_IS_FLOOR) || |
1533 | { |
1602 | QUERY_FLAG(top, FLAG_OVERLAY_FLOOR)) floor = top; |
1534 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1603 | if (QUERY_FLAG(top, FLAG_NO_PICK) |
1535 | floor = top; |
1604 | && (top->move_type & (MOVE_FLY_LOW |MOVE_FLY_HIGH)) |
1536 | |
1605 | && !QUERY_FLAG(top, FLAG_IS_FLOOR)) |
1537 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
1606 | { |
1538 | { |
1607 | /* We insert above top, so we want this object below this */ |
1539 | /* We insert above top, so we want this object below this */ |
1608 | top=top->below; |
1540 | top = top->below; |
1609 | break; |
1541 | break; |
1610 | } |
1542 | } |
1611 | last = top; |
1543 | |
1612 | top = top->above; |
1544 | last = top; |
1613 | } |
1545 | top = top->above; |
|
|
1546 | } |
|
|
1547 | |
1614 | /* Don't want top to be NULL, so set it to the last valid object */ |
1548 | /* Don't want top to be NULL, so set it to the last valid object */ |
1615 | top = last; |
1549 | top = last; |
1616 | |
1550 | |
1617 | /* We let update_position deal with figuring out what the space |
1551 | /* We let update_position deal with figuring out what the space |
1618 | * looks like instead of lots of conditions here. |
1552 | * looks like instead of lots of conditions here. |
1619 | * makes things faster, and effectively the same result. |
1553 | * makes things faster, and effectively the same result. |
1620 | */ |
1554 | */ |
1621 | |
1555 | |
1622 | /* Have object 'fall below' other objects that block view. |
1556 | /* Have object 'fall below' other objects that block view. |
1623 | * Unless those objects are exits, type 66 |
1557 | * Unless those objects are exits, type 66 |
1624 | * If INS_ON_TOP is used, don't do this processing |
1558 | * If INS_ON_TOP is used, don't do this processing |
1625 | * Need to find the object that in fact blocks view, otherwise |
1559 | * Need to find the object that in fact blocks view, otherwise |
1626 | * stacking is a bit odd. |
1560 | * stacking is a bit odd. |
1627 | */ |
1561 | */ |
1628 | if (!(flag & INS_ON_TOP) && |
1562 | if (!(flag & INS_ON_TOP) && |
1629 | (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && |
1563 | (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) |
1630 | (op->face && !op->face->visibility)) { |
1564 | { |
1631 | for (last=top; last != floor; last=last->below) |
1565 | for (last = top; last != floor; last = last->below) |
1632 | if (QUERY_FLAG(last, FLAG_BLOCKSVIEW)&&(last->type != EXIT)) break; |
1566 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
|
|
1567 | break; |
1633 | /* Check to see if we found the object that blocks view, |
1568 | /* Check to see if we found the object that blocks view, |
1634 | * and make sure we have a below pointer for it so that |
1569 | * and make sure we have a below pointer for it so that |
1635 | * we can get inserted below this one, which requires we |
1570 | * we can get inserted below this one, which requires we |
1636 | * set top to the object below us. |
1571 | * set top to the object below us. |
1637 | */ |
1572 | */ |
1638 | if (last && last->below && last != floor) top=last->below; |
1573 | if (last && last->below && last != floor) |
1639 | } |
1574 | top = last->below; |
1640 | } /* If objects on this space */ |
1575 | } |
|
|
1576 | } /* If objects on this space */ |
|
|
1577 | |
1641 | if (flag & INS_MAP_LOAD) |
1578 | if (flag & INS_MAP_LOAD) |
1642 | top = GET_MAP_TOP(op->map,op->x,op->y); |
1579 | top = GET_MAP_TOP (op->map, op->x, op->y); |
|
|
1580 | |
1643 | if (flag & INS_ABOVE_FLOOR_ONLY) top = floor; |
1581 | if (flag & INS_ABOVE_FLOOR_ONLY) |
|
|
1582 | top = floor; |
1644 | |
1583 | |
1645 | /* Top is the object that our object (op) is going to get inserted above. |
1584 | /* Top is the object that our object (op) is going to get inserted above. |
1646 | */ |
1585 | */ |
1647 | |
1586 | |
1648 | /* First object on this space */ |
1587 | /* First object on this space */ |
1649 | if (!top) { |
1588 | if (!top) |
|
|
1589 | { |
1650 | op->above = GET_MAP_OB(op->map, op->x, op->y); |
1590 | op->above = GET_MAP_OB (op->map, op->x, op->y); |
1651 | if (op->above) op->above->below = op; |
1591 | |
|
|
1592 | if (op->above) |
|
|
1593 | op->above->below = op; |
|
|
1594 | |
1652 | op->below = NULL; |
1595 | op->below = NULL; |
1653 | SET_MAP_OB(op->map, op->x, op->y, op); |
1596 | SET_MAP_OB (op->map, op->x, op->y, op); |
1654 | } else { /* get inserted into the stack above top */ |
1597 | } |
|
|
1598 | else |
|
|
1599 | { /* get inserted into the stack above top */ |
1655 | op->above = top->above; |
1600 | op->above = top->above; |
1656 | if (op->above) op->above->below = op; |
1601 | |
|
|
1602 | if (op->above) |
|
|
1603 | op->above->below = op; |
|
|
1604 | |
1657 | op->below = top; |
1605 | op->below = top; |
1658 | top->above = op; |
1606 | top->above = op; |
1659 | } |
1607 | } |
|
|
1608 | |
1660 | if (op->above==NULL) |
1609 | if (op->above == NULL) |
1661 | SET_MAP_TOP(op->map,op->x, op->y, op); |
1610 | SET_MAP_TOP (op->map, op->x, op->y, op); |
1662 | } /* else not INS_BELOW_ORIGINATOR */ |
1611 | } /* else not INS_BELOW_ORIGINATOR */ |
1663 | |
1612 | |
1664 | if(op->type==PLAYER) |
1613 | if (op->type == PLAYER) |
1665 | op->contr->do_los=1; |
1614 | op->contr->do_los = 1; |
1666 | |
1615 | |
1667 | /* If we have a floor, we know the player, if any, will be above |
1616 | /* If we have a floor, we know the player, if any, will be above |
1668 | * it, so save a few ticks and start from there. |
1617 | * it, so save a few ticks and start from there. |
1669 | */ |
1618 | */ |
1670 | if (!(flag & INS_MAP_LOAD)) |
1619 | if (!(flag & INS_MAP_LOAD)) |
1671 | for(tmp=floor?floor:GET_MAP_OB(op->map,op->x,op->y);tmp!=NULL;tmp=tmp->above) { |
1620 | for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1672 | if (tmp->type == PLAYER) |
1621 | if (tmp->type == PLAYER) |
1673 | tmp->contr->socket.update_look=1; |
1622 | tmp->contr->socket.update_look = 1; |
1674 | } |
|
|
1675 | |
1623 | |
1676 | /* If this object glows, it may affect lighting conditions that are |
1624 | /* If this object glows, it may affect lighting conditions that are |
1677 | * visible to others on this map. But update_all_los is really |
1625 | * visible to others on this map. But update_all_los is really |
1678 | * an inefficient way to do this, as it means los for all players |
1626 | * an inefficient way to do this, as it means los for all players |
1679 | * on the map will get recalculated. The players could very well |
1627 | * on the map will get recalculated. The players could very well |
1680 | * be far away from this change and not affected in any way - |
1628 | * be far away from this change and not affected in any way - |
1681 | * this should get redone to only look for players within range, |
1629 | * this should get redone to only look for players within range, |
1682 | * or just updating the P_NEED_UPDATE for spaces within this area |
1630 | * or just updating the P_NEED_UPDATE for spaces within this area |
1683 | * of effect may be sufficient. |
1631 | * of effect may be sufficient. |
1684 | */ |
1632 | */ |
1685 | if(MAP_DARKNESS(op->map) && (op->glow_radius != 0)) |
1633 | if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) |
1686 | update_all_los(op->map, op->x, op->y); |
1634 | update_all_los (op->map, op->x, op->y); |
1687 | |
1635 | |
1688 | |
|
|
1689 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1636 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1690 | update_object(op,UP_OBJ_INSERT); |
1637 | update_object (op, UP_OBJ_INSERT); |
1691 | |
1638 | |
1692 | |
|
|
1693 | /* Don't know if moving this to the end will break anything. However, |
1639 | /* Don't know if moving this to the end will break anything. However, |
1694 | * we want to have update_look set above before calling this. |
1640 | * we want to have update_look set above before calling this. |
1695 | * |
1641 | * |
1696 | * check_move_on() must be after this because code called from |
1642 | * check_move_on() must be after this because code called from |
1697 | * check_move_on() depends on correct map flags (so functions like |
1643 | * check_move_on() depends on correct map flags (so functions like |
1698 | * blocked() and wall() work properly), and these flags are updated by |
1644 | * blocked() and wall() work properly), and these flags are updated by |
1699 | * update_object(). |
1645 | * update_object(). |
1700 | */ |
1646 | */ |
1701 | |
1647 | |
1702 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1648 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1703 | |
|
|
1704 | if (!(flag & INS_NO_WALK_ON) && !op->head) { |
1649 | if (!(flag & INS_NO_WALK_ON) && !op->head) |
|
|
1650 | { |
1705 | if (check_move_on(op, originator)) |
1651 | if (check_move_on (op, originator)) |
1706 | return NULL; |
1652 | return NULL; |
1707 | |
1653 | |
1708 | /* If we are a multi part object, lets work our way through the check |
1654 | /* If we are a multi part object, lets work our way through the check |
1709 | * walk on's. |
1655 | * walk on's. |
1710 | */ |
1656 | */ |
1711 | for (tmp=op->more; tmp!=NULL; tmp=tmp->more) |
1657 | for (tmp = op->more; tmp != NULL; tmp = tmp->more) |
1712 | if (check_move_on (tmp, originator)) |
1658 | if (check_move_on (tmp, originator)) |
1713 | return NULL; |
1659 | return NULL; |
1714 | } |
1660 | } |
|
|
1661 | |
1715 | return op; |
1662 | return op; |
1716 | } |
1663 | } |
1717 | |
1664 | |
1718 | /* this function inserts an object in the map, but if it |
1665 | /* this function inserts an object in the map, but if it |
1719 | * finds an object of its own type, it'll remove that one first. |
1666 | * finds an object of its own type, it'll remove that one first. |
1720 | * op is the object to insert it under: supplies x and the map. |
1667 | * op is the object to insert it under: supplies x and the map. |
1721 | */ |
1668 | */ |
|
|
1669 | void |
1722 | void replace_insert_ob_in_map(const char *arch_string, object *op) { |
1670 | replace_insert_ob_in_map (const char *arch_string, object *op) |
|
|
1671 | { |
1723 | object *tmp; |
1672 | object *tmp; |
1724 | object *tmp1; |
1673 | object *tmp1; |
1725 | |
1674 | |
1726 | /* first search for itself and remove any old instances */ |
1675 | /* first search for itself and remove any old instances */ |
1727 | |
1676 | |
1728 | for(tmp=GET_MAP_OB(op->map,op->x,op->y); tmp!=NULL; tmp=tmp->above) { |
1677 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
|
|
1678 | { |
1729 | if(!strcmp(tmp->arch->name,arch_string)) /* same archetype */ { |
1679 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
|
|
1680 | { |
1730 | remove_ob(tmp); |
1681 | remove_ob (tmp); |
1731 | free_object(tmp); |
1682 | free_object (tmp); |
1732 | } |
1683 | } |
1733 | } |
1684 | } |
1734 | |
1685 | |
1735 | tmp1=arch_to_object(find_archetype(arch_string)); |
1686 | tmp1 = arch_to_object (find_archetype (arch_string)); |
1736 | |
1687 | |
1737 | |
1688 | tmp1->x = op->x; |
1738 | tmp1->x = op->x; tmp1->y = op->y; |
1689 | tmp1->y = op->y; |
1739 | insert_ob_in_map(tmp1,op->map,op,0); |
1690 | insert_ob_in_map (tmp1, op->map, op, 0); |
1740 | } |
1691 | } |
1741 | |
1692 | |
1742 | /* |
1693 | /* |
1743 | * get_split_ob(ob,nr) splits up ob into two parts. The part which |
1694 | * get_split_ob(ob,nr) splits up ob into two parts. The part which |
1744 | * is returned contains nr objects, and the remaining parts contains |
1695 | * is returned contains nr objects, and the remaining parts contains |
1745 | * the rest (or is removed and freed if that number is 0). |
1696 | * the rest (or is removed and freed if that number is 0). |
1746 | * On failure, NULL is returned, and the reason put into the |
1697 | * On failure, NULL is returned, and the reason put into the |
1747 | * global static errmsg array. |
1698 | * global static errmsg array. |
1748 | */ |
1699 | */ |
1749 | |
1700 | |
|
|
1701 | object * |
1750 | object *get_split_ob(object *orig_ob, uint32 nr) { |
1702 | get_split_ob (object *orig_ob, uint32 nr) |
1751 | object *newob; |
1703 | { |
|
|
1704 | object * |
|
|
1705 | newob; |
|
|
1706 | int |
1752 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1707 | is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1753 | |
1708 | |
1754 | if(orig_ob->nrof<nr) { |
1709 | if (orig_ob->nrof < nr) |
1755 | sprintf(errmsg,"There are only %d %ss.", |
|
|
1756 | orig_ob->nrof?orig_ob->nrof:1, orig_ob->name); |
|
|
1757 | return NULL; |
|
|
1758 | } |
1710 | { |
|
|
1711 | sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); |
|
|
1712 | return NULL; |
|
|
1713 | } |
1759 | newob = object_create_clone(orig_ob); |
1714 | newob = object_create_clone (orig_ob); |
1760 | if((orig_ob->nrof-=nr)<1) { |
1715 | if ((orig_ob->nrof -= nr) < 1) |
|
|
1716 | { |
1761 | if ( ! is_removed) |
1717 | if (!is_removed) |
1762 | remove_ob(orig_ob); |
1718 | remove_ob (orig_ob); |
1763 | free_object2(orig_ob, 1); |
1719 | free_object2 (orig_ob, 1); |
1764 | } |
1720 | } |
1765 | else if ( ! is_removed) { |
1721 | else if (!is_removed) |
|
|
1722 | { |
1766 | if(orig_ob->env!=NULL) |
1723 | if (orig_ob->env != NULL) |
1767 | sub_weight (orig_ob->env,orig_ob->weight*nr); |
1724 | sub_weight (orig_ob->env, orig_ob->weight * nr); |
1768 | if (orig_ob->env == NULL && orig_ob->map->in_memory!=MAP_IN_MEMORY) { |
1725 | if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) |
|
|
1726 | { |
1769 | strcpy(errmsg, "Tried to split object whose map is not in memory."); |
1727 | strcpy (errmsg, "Tried to split object whose map is not in memory."); |
1770 | LOG(llevDebug, |
|
|
1771 | "Error, Tried to split object whose map is not in memory.\n"); |
1728 | LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n"); |
1772 | return NULL; |
1729 | return NULL; |
1773 | } |
1730 | } |
1774 | } |
1731 | } |
1775 | newob->nrof=nr; |
1732 | newob->nrof = nr; |
1776 | |
1733 | |
1777 | return newob; |
1734 | return newob; |
1778 | } |
1735 | } |
1779 | |
1736 | |
1780 | /* |
1737 | /* |
1781 | * decrease_ob_nr(object, number) decreases a specified number from |
1738 | * decrease_ob_nr(object, number) decreases a specified number from |
1782 | * the amount of an object. If the amount reaches 0, the object |
1739 | * the amount of an object. If the amount reaches 0, the object |
1783 | * is subsequently removed and freed. |
1740 | * is subsequently removed and freed. |
1784 | * |
1741 | * |
1785 | * Return value: 'op' if something is left, NULL if the amount reached 0 |
1742 | * Return value: 'op' if something is left, NULL if the amount reached 0 |
1786 | */ |
1743 | */ |
1787 | |
1744 | |
|
|
1745 | object * |
1788 | object *decrease_ob_nr (object *op, uint32 i) |
1746 | decrease_ob_nr (object *op, uint32 i) |
1789 | { |
1747 | { |
1790 | object *tmp; |
1748 | object * |
|
|
1749 | tmp; |
1791 | player *pl; |
1750 | player * |
|
|
1751 | pl; |
1792 | |
1752 | |
1793 | if (i == 0) /* objects with op->nrof require this check */ |
1753 | if (i == 0) /* objects with op->nrof require this check */ |
1794 | return op; |
1754 | return op; |
1795 | |
1755 | |
1796 | if (i > op->nrof) |
1756 | if (i > op->nrof) |
1797 | i = op->nrof; |
1757 | i = op->nrof; |
1798 | |
1758 | |
1799 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1759 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
1800 | { |
1760 | { |
1801 | op->nrof -= i; |
1761 | op->nrof -= i; |
1802 | } |
1762 | } |
1803 | else if (op->env != NULL) |
1763 | else if (op->env != NULL) |
1804 | { |
1764 | { |
1805 | /* is this object in the players inventory, or sub container |
1765 | /* is this object in the players inventory, or sub container |
1806 | * therein? |
1766 | * therein? |
1807 | */ |
1767 | */ |
1808 | tmp = is_player_inv (op->env); |
1768 | tmp = is_player_inv (op->env); |
1809 | /* nope. Is this a container the player has opened? |
1769 | /* nope. Is this a container the player has opened? |
1810 | * If so, set tmp to that player. |
1770 | * If so, set tmp to that player. |
1811 | * IMO, searching through all the players will mostly |
1771 | * IMO, searching through all the players will mostly |
1812 | * likely be quicker than following op->env to the map, |
1772 | * likely be quicker than following op->env to the map, |
1813 | * and then searching the map for a player. |
1773 | * and then searching the map for a player. |
1814 | */ |
1774 | */ |
1815 | if (!tmp) { |
1775 | if (!tmp) |
|
|
1776 | { |
1816 | for (pl=first_player; pl; pl=pl->next) |
1777 | for (pl = first_player; pl; pl = pl->next) |
1817 | if (pl->ob->container == op->env) break; |
1778 | if (pl->ob->container == op->env) |
1818 | if (pl) tmp=pl->ob; |
1779 | break; |
1819 | else tmp=NULL; |
1780 | if (pl) |
1820 | } |
1781 | tmp = pl->ob; |
|
|
1782 | else |
|
|
1783 | tmp = NULL; |
|
|
1784 | } |
1821 | |
1785 | |
1822 | if (i < op->nrof) { |
1786 | if (i < op->nrof) |
|
|
1787 | { |
1823 | sub_weight (op->env, op->weight * i); |
1788 | sub_weight (op->env, op->weight * i); |
1824 | op->nrof -= i; |
1789 | op->nrof -= i; |
1825 | if (tmp) { |
1790 | if (tmp) |
|
|
1791 | { |
1826 | esrv_send_item(tmp, op); |
1792 | esrv_send_item (tmp, op); |
1827 | } |
1793 | } |
|
|
1794 | } |
1828 | } else { |
1795 | else |
|
|
1796 | { |
1829 | remove_ob (op); |
1797 | remove_ob (op); |
1830 | op->nrof = 0; |
1798 | op->nrof = 0; |
1831 | if (tmp) { |
1799 | if (tmp) |
|
|
1800 | { |
1832 | esrv_del_item(tmp->contr, op->count); |
1801 | esrv_del_item (tmp->contr, op->count); |
1833 | } |
1802 | } |
1834 | } |
1803 | } |
1835 | } |
1804 | } |
1836 | else |
1805 | else |
1837 | { |
1806 | { |
1838 | object *above = op->above; |
1807 | object * |
|
|
1808 | above = op->above; |
1839 | |
1809 | |
1840 | if (i < op->nrof) { |
1810 | if (i < op->nrof) |
|
|
1811 | { |
1841 | op->nrof -= i; |
1812 | op->nrof -= i; |
|
|
1813 | } |
1842 | } else { |
1814 | else |
|
|
1815 | { |
1843 | remove_ob (op); |
1816 | remove_ob (op); |
1844 | op->nrof = 0; |
1817 | op->nrof = 0; |
1845 | } |
1818 | } |
1846 | /* Since we just removed op, op->above is null */ |
1819 | /* Since we just removed op, op->above is null */ |
1847 | for (tmp = above; tmp != NULL; tmp = tmp->above) |
1820 | for (tmp = above; tmp != NULL; tmp = tmp->above) |
1848 | if (tmp->type == PLAYER) { |
1821 | if (tmp->type == PLAYER) |
|
|
1822 | { |
1849 | if (op->nrof) |
1823 | if (op->nrof) |
1850 | esrv_send_item(tmp, op); |
1824 | esrv_send_item (tmp, op); |
1851 | else |
1825 | else |
1852 | esrv_del_item(tmp->contr, op->count); |
1826 | esrv_del_item (tmp->contr, op->count); |
1853 | } |
1827 | } |
1854 | } |
1828 | } |
1855 | |
1829 | |
1856 | if (op->nrof) { |
1830 | if (op->nrof) |
|
|
1831 | { |
1857 | return op; |
1832 | return op; |
1858 | } else { |
1833 | } |
|
|
1834 | else |
|
|
1835 | { |
1859 | free_object (op); |
1836 | free_object (op); |
1860 | return NULL; |
1837 | return NULL; |
1861 | } |
1838 | } |
1862 | } |
1839 | } |
1863 | |
1840 | |
1864 | /* |
1841 | /* |
1865 | * add_weight(object, weight) adds the specified weight to an object, |
1842 | * add_weight(object, weight) adds the specified weight to an object, |
1866 | * and also updates how much the environment(s) is/are carrying. |
1843 | * and also updates how much the environment(s) is/are carrying. |
1867 | */ |
1844 | */ |
1868 | |
1845 | |
|
|
1846 | void |
1869 | void add_weight (object *op, signed long weight) { |
1847 | add_weight (object *op, signed long weight) |
|
|
1848 | { |
1870 | while (op!=NULL) { |
1849 | while (op != NULL) |
|
|
1850 | { |
1871 | if (op->type == CONTAINER) { |
1851 | if (op->type == CONTAINER) |
|
|
1852 | { |
1872 | weight=(signed long)(weight*(100-op->stats.Str)/100); |
1853 | weight = (signed long) (weight * (100 - op->stats.Str) / 100); |
1873 | } |
1854 | } |
1874 | op->carrying+=weight; |
1855 | op->carrying += weight; |
1875 | op=op->env; |
1856 | op = op->env; |
1876 | } |
1857 | } |
1877 | } |
1858 | } |
1878 | |
1859 | |
1879 | /* |
1860 | /* |
1880 | * insert_ob_in_ob(op,environment): |
1861 | * insert_ob_in_ob(op,environment): |
1881 | * This function inserts the object op in the linked list |
1862 | * This function inserts the object op in the linked list |
… | |
… | |
1888 | * |
1869 | * |
1889 | * The function returns now pointer to inserted item, and return value can |
1870 | * The function returns now pointer to inserted item, and return value can |
1890 | * be != op, if items are merged. -Tero |
1871 | * be != op, if items are merged. -Tero |
1891 | */ |
1872 | */ |
1892 | |
1873 | |
|
|
1874 | object * |
1893 | object *insert_ob_in_ob(object *op,object *where) { |
1875 | insert_ob_in_ob (object *op, object *where) |
1894 | object *tmp, *otmp; |
1876 | { |
|
|
1877 | object * |
|
|
1878 | tmp, * |
|
|
1879 | otmp; |
1895 | |
1880 | |
1896 | if(!QUERY_FLAG(op,FLAG_REMOVED)) { |
1881 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
1882 | { |
1897 | dump_object(op); |
1883 | dump_object (op); |
1898 | LOG(llevError,"Trying to insert (ob) inserted object.\n%s\n", errmsg); |
1884 | LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); |
1899 | return op; |
1885 | return op; |
1900 | } |
1886 | } |
1901 | if(where==NULL) { |
1887 | if (where == NULL) |
|
|
1888 | { |
1902 | dump_object(op); |
1889 | dump_object (op); |
1903 | LOG(llevError,"Trying to put object in NULL.\n%s\n", errmsg); |
1890 | LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); |
1904 | return op; |
1891 | return op; |
1905 | } |
1892 | } |
1906 | if (where->head) { |
1893 | if (where->head) |
1907 | LOG(llevDebug, |
1894 | { |
1908 | "Warning: Tried to insert object wrong part of multipart object.\n"); |
1895 | LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); |
1909 | where = where->head; |
1896 | where = where->head; |
1910 | } |
1897 | } |
1911 | if (op->more) { |
1898 | if (op->more) |
|
|
1899 | { |
1912 | LOG(llevError, "Tried to insert multipart object %s (%d)\n", |
1900 | LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); |
1913 | op->name, op->count); |
|
|
1914 | return op; |
1901 | return op; |
1915 | } |
1902 | } |
1916 | CLEAR_FLAG(op, FLAG_OBJ_ORIGINAL); |
1903 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1917 | CLEAR_FLAG(op, FLAG_REMOVED); |
1904 | CLEAR_FLAG (op, FLAG_REMOVED); |
1918 | if(op->nrof) { |
1905 | if (op->nrof) |
|
|
1906 | { |
1919 | for(tmp=where->inv;tmp!=NULL;tmp=tmp->below) |
1907 | for (tmp = where->inv; tmp != NULL; tmp = tmp->below) |
1920 | if ( CAN_MERGE(tmp,op) ) { |
1908 | if (CAN_MERGE (tmp, op)) |
|
|
1909 | { |
1921 | /* return the original object and remove inserted object |
1910 | /* return the original object and remove inserted object |
1922 | (client needs the original object) */ |
1911 | (client needs the original object) */ |
1923 | tmp->nrof += op->nrof; |
1912 | tmp->nrof += op->nrof; |
1924 | /* Weight handling gets pretty funky. Since we are adding to |
1913 | /* Weight handling gets pretty funky. Since we are adding to |
1925 | * tmp->nrof, we need to increase the weight. |
1914 | * tmp->nrof, we need to increase the weight. |
1926 | */ |
1915 | */ |
1927 | add_weight (where, op->weight*op->nrof); |
1916 | add_weight (where, op->weight * op->nrof); |
1928 | SET_FLAG(op, FLAG_REMOVED); |
1917 | SET_FLAG (op, FLAG_REMOVED); |
1929 | free_object(op); /* free the inserted object */ |
1918 | free_object (op); /* free the inserted object */ |
1930 | op = tmp; |
1919 | op = tmp; |
1931 | remove_ob (op); /* and fix old object's links */ |
1920 | remove_ob (op); /* and fix old object's links */ |
1932 | CLEAR_FLAG(op, FLAG_REMOVED); |
1921 | CLEAR_FLAG (op, FLAG_REMOVED); |
1933 | break; |
1922 | break; |
1934 | } |
1923 | } |
1935 | |
1924 | |
1936 | /* I assume combined objects have no inventory |
1925 | /* I assume combined objects have no inventory |
1937 | * We add the weight - this object could have just been removed |
1926 | * We add the weight - this object could have just been removed |
1938 | * (if it was possible to merge). calling remove_ob will subtract |
1927 | * (if it was possible to merge). calling remove_ob will subtract |
1939 | * the weight, so we need to add it in again, since we actually do |
1928 | * the weight, so we need to add it in again, since we actually do |
1940 | * the linking below |
1929 | * the linking below |
1941 | */ |
1930 | */ |
1942 | add_weight (where, op->weight*op->nrof); |
1931 | add_weight (where, op->weight * op->nrof); |
|
|
1932 | } |
1943 | } else |
1933 | else |
1944 | add_weight (where, (op->weight+op->carrying)); |
1934 | add_weight (where, (op->weight + op->carrying)); |
1945 | |
1935 | |
1946 | otmp=is_player_inv(where); |
1936 | otmp = is_player_inv (where); |
1947 | if (otmp&&otmp->contr!=NULL) { |
1937 | if (otmp && otmp->contr != NULL) |
|
|
1938 | { |
1948 | if (!QUERY_FLAG(otmp,FLAG_NO_FIX_PLAYER)) |
1939 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1949 | fix_player(otmp); |
1940 | fix_player (otmp); |
1950 | } |
1941 | } |
1951 | |
1942 | |
1952 | op->map=NULL; |
1943 | op->map = NULL; |
1953 | op->env=where; |
1944 | op->env = where; |
1954 | op->above=NULL; |
1945 | op->above = NULL; |
1955 | op->below=NULL; |
1946 | op->below = NULL; |
1956 | op->x=0,op->y=0; |
1947 | op->x = 0, op->y = 0; |
1957 | op->ox=0,op->oy=0; |
|
|
1958 | |
1948 | |
1959 | /* reset the light list and los of the players on the map */ |
1949 | /* reset the light list and los of the players on the map */ |
1960 | if((op->glow_radius!=0)&&where->map) |
1950 | if ((op->glow_radius != 0) && where->map) |
1961 | { |
1951 | { |
1962 | #ifdef DEBUG_LIGHTS |
1952 | #ifdef DEBUG_LIGHTS |
1963 | LOG(llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", |
1953 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1964 | op->name); |
|
|
1965 | #endif /* DEBUG_LIGHTS */ |
1954 | #endif /* DEBUG_LIGHTS */ |
|
|
1955 | if (MAP_DARKNESS (where->map)) |
1966 | if (MAP_DARKNESS(where->map)) update_all_los(where->map, where->x, where->y); |
1956 | update_all_los (where->map, where->x, where->y); |
1967 | } |
1957 | } |
1968 | |
1958 | |
1969 | /* Client has no idea of ordering so lets not bother ordering it here. |
1959 | /* Client has no idea of ordering so lets not bother ordering it here. |
1970 | * It sure simplifies this function... |
1960 | * It sure simplifies this function... |
1971 | */ |
1961 | */ |
1972 | if (where->inv==NULL) |
1962 | if (where->inv == NULL) |
1973 | where->inv=op; |
1963 | where->inv = op; |
1974 | else { |
1964 | else |
|
|
1965 | { |
1975 | op->below = where->inv; |
1966 | op->below = where->inv; |
1976 | op->below->above = op; |
1967 | op->below->above = op; |
1977 | where->inv = op; |
1968 | where->inv = op; |
1978 | } |
1969 | } |
1979 | return op; |
1970 | return op; |
1980 | } |
1971 | } |
1981 | |
1972 | |
1982 | /* |
1973 | /* |
1983 | * Checks if any objects has a move_type that matches objects |
1974 | * Checks if any objects has a move_type that matches objects |
… | |
… | |
1998 | * MSW 2001-07-08: Check all objects on space, not just those below |
1989 | * MSW 2001-07-08: Check all objects on space, not just those below |
1999 | * object being inserted. insert_ob_in_map may not put new objects |
1990 | * object being inserted. insert_ob_in_map may not put new objects |
2000 | * on top. |
1991 | * on top. |
2001 | */ |
1992 | */ |
2002 | |
1993 | |
|
|
1994 | int |
2003 | int check_move_on (object *op, object *originator) |
1995 | check_move_on (object *op, object *originator) |
2004 | { |
1996 | { |
2005 | object *tmp; |
1997 | object *tmp; |
2006 | tag_t tag; |
1998 | tag_t tag; |
2007 | mapstruct *m=op->map; |
1999 | mapstruct *m = op->map; |
2008 | int x=op->x, y=op->y; |
2000 | int x = op->x, y = op->y; |
|
|
2001 | |
2009 | MoveType move_on, move_slow, move_block; |
2002 | MoveType move_on, move_slow, move_block; |
2010 | |
2003 | |
2011 | if(QUERY_FLAG(op,FLAG_NO_APPLY)) |
2004 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
2012 | return 0; |
|
|
2013 | |
|
|
2014 | tag = op->count; |
|
|
2015 | |
|
|
2016 | move_on = GET_MAP_MOVE_ON(op->map, op->x, op->y); |
|
|
2017 | move_slow = GET_MAP_MOVE_SLOW(op->map, op->x, op->y); |
|
|
2018 | move_block = GET_MAP_MOVE_BLOCK(op->map, op->x, op->y); |
|
|
2019 | |
|
|
2020 | /* if nothing on this space will slow op down or be applied, |
|
|
2021 | * no need to do checking below. have to make sure move_type |
|
|
2022 | * is set, as lots of objects don't have it set - we treat that |
|
|
2023 | * as walking. |
|
|
2024 | */ |
|
|
2025 | if (op->move_type && !(op->move_type & move_on) && !(op->move_type & move_slow)) |
|
|
2026 | return 0; |
|
|
2027 | |
|
|
2028 | /* This is basically inverse logic of that below - basically, |
|
|
2029 | * if the object can avoid the move on or slow move, they do so, |
|
|
2030 | * but can't do it if the alternate movement they are using is |
|
|
2031 | * blocked. Logic on this seems confusing, but does seem correct. |
|
|
2032 | */ |
|
|
2033 | if ((op->move_type & ~move_on & ~move_block) != 0 && |
|
|
2034 | (op->move_type & ~move_slow & ~move_block) != 0) return 0; |
|
|
2035 | |
|
|
2036 | /* The objects have to be checked from top to bottom. |
|
|
2037 | * Hence, we first go to the top: |
|
|
2038 | */ |
|
|
2039 | |
|
|
2040 | for (tmp=GET_MAP_OB(op->map, op->x, op->y); tmp!=NULL && |
|
|
2041 | tmp->above!=NULL; tmp=tmp->above) { |
|
|
2042 | /* Trim the search when we find the first other spell effect |
|
|
2043 | * this helps performance so that if a space has 50 spell objects, |
|
|
2044 | * we don't need to check all of them. |
|
|
2045 | */ |
|
|
2046 | if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG(tmp, FLAG_NO_PICK)) break; |
|
|
2047 | } |
|
|
2048 | for(;tmp!=NULL; tmp=tmp->below) { |
|
|
2049 | if (tmp == op) continue; /* Can't apply yourself */ |
|
|
2050 | |
|
|
2051 | /* Check to see if one of the movement types should be slowed down. |
|
|
2052 | * Second check makes sure that the movement types not being slowed |
|
|
2053 | * (~slow_move) is not blocked on this space - just because the |
|
|
2054 | * space doesn't slow down swimming (for example), if you can't actually |
|
|
2055 | * swim on that space, can't use it to avoid the penalty. |
|
|
2056 | */ |
|
|
2057 | if (!QUERY_FLAG(op, FLAG_WIZPASS)) { |
|
|
2058 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
|
|
2059 | ((op->move_type & tmp->move_slow) && |
|
|
2060 | (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) { |
|
|
2061 | |
|
|
2062 | float diff; |
|
|
2063 | |
|
|
2064 | diff = tmp->move_slow_penalty*FABS(op->speed); |
|
|
2065 | if (op->type == PLAYER) { |
|
|
2066 | if ((QUERY_FLAG(tmp, FLAG_IS_HILLY) && find_skill_by_number(op, SK_CLIMBING)) || |
|
|
2067 | (QUERY_FLAG(tmp, FLAG_IS_WOODED) && find_skill_by_number(op, SK_WOODSMAN))) { |
|
|
2068 | diff /= 4.0; |
|
|
2069 | } |
|
|
2070 | } |
|
|
2071 | op->speed_left -= diff; |
|
|
2072 | } |
|
|
2073 | } |
|
|
2074 | |
|
|
2075 | /* Basically same logic as above, except now for actual apply. */ |
|
|
2076 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
|
|
2077 | ((op->move_type & tmp->move_on) && |
|
|
2078 | (op->move_type & ~tmp->move_on & ~tmp->move_block)==0)) { |
|
|
2079 | |
|
|
2080 | move_apply(tmp, op, originator); |
|
|
2081 | if (was_destroyed (op, tag)) |
|
|
2082 | return 1; |
|
|
2083 | |
|
|
2084 | /* what the person/creature stepped onto has moved the object |
|
|
2085 | * someplace new. Don't process any further - if we did, |
|
|
2086 | * have a feeling strange problems would result. |
|
|
2087 | */ |
|
|
2088 | if (op->map != m || op->x != x || op->y != y) return 0; |
|
|
2089 | } |
|
|
2090 | } |
|
|
2091 | return 0; |
2005 | return 0; |
|
|
2006 | |
|
|
2007 | tag = op->count; |
|
|
2008 | |
|
|
2009 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
|
|
2010 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
|
|
2011 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
|
|
2012 | |
|
|
2013 | /* if nothing on this space will slow op down or be applied, |
|
|
2014 | * no need to do checking below. have to make sure move_type |
|
|
2015 | * is set, as lots of objects don't have it set - we treat that |
|
|
2016 | * as walking. |
|
|
2017 | */ |
|
|
2018 | if (op->move_type && !(op->move_type & move_on) && !(op->move_type & move_slow)) |
|
|
2019 | return 0; |
|
|
2020 | |
|
|
2021 | /* This is basically inverse logic of that below - basically, |
|
|
2022 | * if the object can avoid the move on or slow move, they do so, |
|
|
2023 | * but can't do it if the alternate movement they are using is |
|
|
2024 | * blocked. Logic on this seems confusing, but does seem correct. |
|
|
2025 | */ |
|
|
2026 | if ((op->move_type & ~move_on & ~move_block) != 0 && (op->move_type & ~move_slow & ~move_block) != 0) |
|
|
2027 | return 0; |
|
|
2028 | |
|
|
2029 | /* The objects have to be checked from top to bottom. |
|
|
2030 | * Hence, we first go to the top: |
|
|
2031 | */ |
|
|
2032 | |
|
|
2033 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) |
|
|
2034 | { |
|
|
2035 | /* Trim the search when we find the first other spell effect |
|
|
2036 | * this helps performance so that if a space has 50 spell objects, |
|
|
2037 | * we don't need to check all of them. |
|
|
2038 | */ |
|
|
2039 | if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK)) |
|
|
2040 | break; |
|
|
2041 | } |
|
|
2042 | |
|
|
2043 | for (; tmp; tmp = tmp->below) |
|
|
2044 | { |
|
|
2045 | if (tmp == op) |
|
|
2046 | continue; /* Can't apply yourself */ |
|
|
2047 | |
|
|
2048 | /* Check to see if one of the movement types should be slowed down. |
|
|
2049 | * Second check makes sure that the movement types not being slowed |
|
|
2050 | * (~slow_move) is not blocked on this space - just because the |
|
|
2051 | * space doesn't slow down swimming (for example), if you can't actually |
|
|
2052 | * swim on that space, can't use it to avoid the penalty. |
|
|
2053 | */ |
|
|
2054 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
|
|
2055 | { |
|
|
2056 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
|
|
2057 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
|
|
2058 | { |
|
|
2059 | |
|
|
2060 | float diff = tmp->move_slow_penalty * FABS (op->speed); |
|
|
2061 | |
|
|
2062 | if (op->type == PLAYER) |
|
|
2063 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
|
|
2064 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
|
|
2065 | diff /= 4.0; |
|
|
2066 | |
|
|
2067 | op->speed_left -= diff; |
|
|
2068 | } |
|
|
2069 | } |
|
|
2070 | |
|
|
2071 | /* Basically same logic as above, except now for actual apply. */ |
|
|
2072 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
|
|
2073 | ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) |
|
|
2074 | { |
|
|
2075 | move_apply (tmp, op, originator); |
|
|
2076 | |
|
|
2077 | if (was_destroyed (op, tag)) |
|
|
2078 | return 1; |
|
|
2079 | |
|
|
2080 | /* what the person/creature stepped onto has moved the object |
|
|
2081 | * someplace new. Don't process any further - if we did, |
|
|
2082 | * have a feeling strange problems would result. |
|
|
2083 | */ |
|
|
2084 | if (op->map != m || op->x != x || op->y != y) |
|
|
2085 | return 0; |
|
|
2086 | } |
|
|
2087 | } |
|
|
2088 | |
|
|
2089 | return 0; |
2092 | } |
2090 | } |
2093 | |
2091 | |
2094 | /* |
2092 | /* |
2095 | * present_arch(arch, map, x, y) searches for any objects with |
2093 | * present_arch(arch, map, x, y) searches for any objects with |
2096 | * a matching archetype at the given map and coordinates. |
2094 | * a matching archetype at the given map and coordinates. |
2097 | * The first matching object is returned, or NULL if none. |
2095 | * The first matching object is returned, or NULL if none. |
2098 | */ |
2096 | */ |
2099 | |
2097 | |
|
|
2098 | object * |
2100 | object *present_arch(const archetype *at, mapstruct *m, int x, int y) { |
2099 | present_arch (const archetype *at, mapstruct *m, int x, int y) |
|
|
2100 | { |
2101 | object *tmp; |
2101 | object * |
|
|
2102 | tmp; |
|
|
2103 | |
2102 | if(m==NULL || out_of_map(m,x,y)) { |
2104 | if (m == NULL || out_of_map (m, x, y)) |
|
|
2105 | { |
2103 | LOG(llevError,"Present_arch called outside map.\n"); |
2106 | LOG (llevError, "Present_arch called outside map.\n"); |
2104 | return NULL; |
2107 | return NULL; |
2105 | } |
2108 | } |
2106 | for(tmp=GET_MAP_OB(m,x,y); tmp != NULL; tmp = tmp->above) |
2109 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
2107 | if(tmp->arch == at) |
2110 | if (tmp->arch == at) |
2108 | return tmp; |
2111 | return tmp; |
2109 | return NULL; |
2112 | return NULL; |
2110 | } |
2113 | } |
2111 | |
2114 | |
2112 | /* |
2115 | /* |
2113 | * present(type, map, x, y) searches for any objects with |
2116 | * present(type, map, x, y) searches for any objects with |
2114 | * a matching type variable at the given map and coordinates. |
2117 | * a matching type variable at the given map and coordinates. |
2115 | * The first matching object is returned, or NULL if none. |
2118 | * The first matching object is returned, or NULL if none. |
2116 | */ |
2119 | */ |
2117 | |
2120 | |
|
|
2121 | object * |
2118 | object *present(unsigned char type,mapstruct *m, int x,int y) { |
2122 | present (unsigned char type, mapstruct *m, int x, int y) |
|
|
2123 | { |
2119 | object *tmp; |
2124 | object * |
|
|
2125 | tmp; |
|
|
2126 | |
2120 | if(out_of_map(m,x,y)) { |
2127 | if (out_of_map (m, x, y)) |
|
|
2128 | { |
2121 | LOG(llevError,"Present called outside map.\n"); |
2129 | LOG (llevError, "Present called outside map.\n"); |
2122 | return NULL; |
2130 | return NULL; |
2123 | } |
2131 | } |
2124 | for(tmp=GET_MAP_OB(m,x,y);tmp!=NULL;tmp=tmp->above) |
2132 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
2125 | if(tmp->type==type) |
2133 | if (tmp->type == type) |
2126 | return tmp; |
2134 | return tmp; |
2127 | return NULL; |
2135 | return NULL; |
2128 | } |
2136 | } |
2129 | |
2137 | |
2130 | /* |
2138 | /* |
2131 | * present_in_ob(type, object) searches for any objects with |
2139 | * present_in_ob(type, object) searches for any objects with |
2132 | * a matching type variable in the inventory of the given object. |
2140 | * a matching type variable in the inventory of the given object. |
2133 | * The first matching object is returned, or NULL if none. |
2141 | * The first matching object is returned, or NULL if none. |
2134 | */ |
2142 | */ |
2135 | |
2143 | |
|
|
2144 | object * |
2136 | object *present_in_ob(unsigned char type, const object *op) { |
2145 | present_in_ob (unsigned char type, const object *op) |
|
|
2146 | { |
2137 | object *tmp; |
2147 | object * |
|
|
2148 | tmp; |
|
|
2149 | |
2138 | for(tmp=op->inv;tmp!=NULL;tmp=tmp->below) |
2150 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
2139 | if(tmp->type==type) |
2151 | if (tmp->type == type) |
2140 | return tmp; |
2152 | return tmp; |
2141 | return NULL; |
2153 | return NULL; |
2142 | } |
2154 | } |
2143 | |
2155 | |
2144 | /* |
2156 | /* |
… | |
… | |
2154 | * the object name, not the archetype name. this is so that the |
2166 | * the object name, not the archetype name. this is so that the |
2155 | * spell code can use one object type (force), but change it's name |
2167 | * spell code can use one object type (force), but change it's name |
2156 | * to be unique. |
2168 | * to be unique. |
2157 | */ |
2169 | */ |
2158 | |
2170 | |
|
|
2171 | object * |
2159 | object *present_in_ob_by_name(int type, const char *str, const object *op) { |
2172 | present_in_ob_by_name (int type, const char *str, const object *op) |
|
|
2173 | { |
2160 | object *tmp; |
2174 | object * |
|
|
2175 | tmp; |
2161 | |
2176 | |
2162 | for(tmp=op->inv; tmp!=NULL; tmp=tmp->below) { |
2177 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
|
|
2178 | { |
2163 | if ((type==-1 || tmp->type==type) && (!strcmp(str, tmp->name))) |
2179 | if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) |
2164 | return tmp; |
2180 | return tmp; |
2165 | } |
2181 | } |
2166 | return NULL; |
2182 | return NULL; |
2167 | } |
2183 | } |
2168 | |
2184 | |
2169 | /* |
2185 | /* |
2170 | * present_arch_in_ob(archetype, object) searches for any objects with |
2186 | * present_arch_in_ob(archetype, object) searches for any objects with |
2171 | * a matching archetype in the inventory of the given object. |
2187 | * a matching archetype in the inventory of the given object. |
2172 | * The first matching object is returned, or NULL if none. |
2188 | * The first matching object is returned, or NULL if none. |
2173 | */ |
2189 | */ |
2174 | |
2190 | |
|
|
2191 | object * |
2175 | object *present_arch_in_ob(const archetype *at, const object *op) { |
2192 | present_arch_in_ob (const archetype *at, const object *op) |
|
|
2193 | { |
2176 | object *tmp; |
2194 | object * |
|
|
2195 | tmp; |
|
|
2196 | |
2177 | for(tmp=op->inv;tmp!=NULL;tmp=tmp->below) |
2197 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
2178 | if( tmp->arch == at) |
2198 | if (tmp->arch == at) |
2179 | return tmp; |
2199 | return tmp; |
2180 | return NULL; |
2200 | return NULL; |
2181 | } |
2201 | } |
2182 | |
2202 | |
2183 | /* |
2203 | /* |
2184 | * activate recursively a flag on an object inventory |
2204 | * activate recursively a flag on an object inventory |
2185 | */ |
2205 | */ |
|
|
2206 | void |
2186 | void flag_inv(object*op, int flag){ |
2207 | flag_inv (object *op, int flag) |
|
|
2208 | { |
2187 | object *tmp; |
2209 | object * |
|
|
2210 | tmp; |
|
|
2211 | |
2188 | if(op->inv) |
2212 | if (op->inv) |
2189 | for(tmp = op->inv; tmp != NULL; tmp = tmp->below){ |
2213 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
|
|
2214 | { |
2190 | SET_FLAG(tmp, flag); |
2215 | SET_FLAG (tmp, flag); |
2191 | flag_inv(tmp,flag); |
2216 | flag_inv (tmp, flag); |
2192 | } |
2217 | } |
2193 | }/* |
2218 | } /* |
2194 | * desactivate recursively a flag on an object inventory |
2219 | * desactivate recursively a flag on an object inventory |
2195 | */ |
2220 | */ |
|
|
2221 | void |
2196 | void unflag_inv(object*op, int flag){ |
2222 | unflag_inv (object *op, int flag) |
|
|
2223 | { |
2197 | object *tmp; |
2224 | object * |
|
|
2225 | tmp; |
|
|
2226 | |
2198 | if(op->inv) |
2227 | if (op->inv) |
2199 | for(tmp = op->inv; tmp != NULL; tmp = tmp->below){ |
2228 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
|
|
2229 | { |
2200 | CLEAR_FLAG(tmp, flag); |
2230 | CLEAR_FLAG (tmp, flag); |
2201 | unflag_inv(tmp,flag); |
2231 | unflag_inv (tmp, flag); |
2202 | } |
2232 | } |
2203 | } |
2233 | } |
2204 | |
2234 | |
2205 | /* |
2235 | /* |
2206 | * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in |
2236 | * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in |
2207 | * all it's inventory (recursively). |
2237 | * all it's inventory (recursively). |
2208 | * If checksums are used, a player will get set_cheat called for |
2238 | * If checksums are used, a player will get set_cheat called for |
2209 | * him/her-self and all object carried by a call to this function. |
2239 | * him/her-self and all object carried by a call to this function. |
2210 | */ |
2240 | */ |
2211 | |
2241 | |
|
|
2242 | void |
2212 | void set_cheat(object *op) { |
2243 | set_cheat (object *op) |
|
|
2244 | { |
2213 | SET_FLAG(op, FLAG_WAS_WIZ); |
2245 | SET_FLAG (op, FLAG_WAS_WIZ); |
2214 | flag_inv(op, FLAG_WAS_WIZ); |
2246 | flag_inv (op, FLAG_WAS_WIZ); |
2215 | } |
2247 | } |
2216 | |
2248 | |
2217 | /* |
2249 | /* |
2218 | * find_free_spot(object, map, x, y, start, stop) will search for |
2250 | * find_free_spot(object, map, x, y, start, stop) will search for |
2219 | * a spot at the given map and coordinates which will be able to contain |
2251 | * a spot at the given map and coordinates which will be able to contain |
… | |
… | |
2234 | * to know if the space in question will block the object. We can't use |
2266 | * to know if the space in question will block the object. We can't use |
2235 | * the archetype because that isn't correct if the monster has been |
2267 | * the archetype because that isn't correct if the monster has been |
2236 | * customized, changed states, etc. |
2268 | * customized, changed states, etc. |
2237 | */ |
2269 | */ |
2238 | |
2270 | |
|
|
2271 | int |
2239 | int find_free_spot(const object *ob, mapstruct *m,int x,int y,int start,int stop) { |
2272 | find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) |
|
|
2273 | { |
|
|
2274 | int |
|
|
2275 | i, |
2240 | int i,index=0, flag; |
2276 | index = 0, flag; |
|
|
2277 | static int |
2241 | static int altern[SIZEOFFREE]; |
2278 | altern[SIZEOFFREE]; |
2242 | |
2279 | |
2243 | for(i=start;i<stop;i++) { |
2280 | for (i = start; i < stop; i++) |
|
|
2281 | { |
2244 | flag = ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i]); |
2282 | flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); |
2245 | if(!flag) |
2283 | if (!flag) |
2246 | altern[index++]=i; |
2284 | altern[index++] = i; |
2247 | |
2285 | |
2248 | /* Basically, if we find a wall on a space, we cut down the search size. |
2286 | /* Basically, if we find a wall on a space, we cut down the search size. |
2249 | * In this way, we won't return spaces that are on another side of a wall. |
2287 | * In this way, we won't return spaces that are on another side of a wall. |
2250 | * This mostly work, but it cuts down the search size in all directions - |
2288 | * This mostly work, but it cuts down the search size in all directions - |
2251 | * if the space being examined only has a wall to the north and empty |
2289 | * if the space being examined only has a wall to the north and empty |
2252 | * spaces in all the other directions, this will reduce the search space |
2290 | * spaces in all the other directions, this will reduce the search space |
2253 | * to only the spaces immediately surrounding the target area, and |
2291 | * to only the spaces immediately surrounding the target area, and |
2254 | * won't look 2 spaces south of the target space. |
2292 | * won't look 2 spaces south of the target space. |
2255 | */ |
2293 | */ |
2256 | else if ((flag & AB_NO_PASS) && maxfree[i]<stop) |
2294 | else if ((flag & AB_NO_PASS) && maxfree[i] < stop) |
2257 | stop=maxfree[i]; |
2295 | stop = maxfree[i]; |
2258 | } |
2296 | } |
2259 | if(!index) return -1; |
2297 | if (!index) |
|
|
2298 | return -1; |
2260 | return altern[RANDOM()%index]; |
2299 | return altern[RANDOM () % index]; |
2261 | } |
2300 | } |
2262 | |
2301 | |
2263 | /* |
2302 | /* |
2264 | * find_first_free_spot(archetype, mapstruct, x, y) works like |
2303 | * find_first_free_spot(archetype, mapstruct, x, y) works like |
2265 | * find_free_spot(), but it will search max number of squares. |
2304 | * find_free_spot(), but it will search max number of squares. |
2266 | * But it will return the first available spot, not a random choice. |
2305 | * But it will return the first available spot, not a random choice. |
2267 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2306 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2268 | */ |
2307 | */ |
2269 | |
2308 | |
|
|
2309 | int |
2270 | int find_first_free_spot(const object *ob, mapstruct *m,int x,int y) { |
2310 | find_first_free_spot (const object *ob, mapstruct *m, int x, int y) |
|
|
2311 | { |
|
|
2312 | int |
2271 | int i; |
2313 | i; |
|
|
2314 | |
2272 | for(i=0;i<SIZEOFFREE;i++) { |
2315 | for (i = 0; i < SIZEOFFREE; i++) |
|
|
2316 | { |
2273 | if(!ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i])) |
2317 | if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) |
2274 | return i; |
2318 | return i; |
2275 | } |
2319 | } |
2276 | return -1; |
2320 | return -1; |
2277 | } |
2321 | } |
2278 | |
2322 | |
2279 | /* |
2323 | /* |
2280 | * The function permute(arr, begin, end) randomly reorders the array |
2324 | * The function permute(arr, begin, end) randomly reorders the array |
2281 | * arr[begin..end-1]. |
2325 | * arr[begin..end-1]. |
2282 | */ |
2326 | */ |
|
|
2327 | static void |
2283 | static void permute(int *arr, int begin, int end) |
2328 | permute (int *arr, int begin, int end) |
2284 | { |
2329 | { |
2285 | int i, j, tmp, len; |
2330 | int |
|
|
2331 | i, |
|
|
2332 | j, |
|
|
2333 | tmp, |
|
|
2334 | len; |
2286 | |
2335 | |
2287 | len = end-begin; |
2336 | len = end - begin; |
2288 | for(i = begin; i < end; i++) |
2337 | for (i = begin; i < end; i++) |
2289 | { |
2338 | { |
2290 | j = begin+RANDOM()%len; |
2339 | j = begin + RANDOM () % len; |
2291 | |
2340 | |
2292 | tmp = arr[i]; |
2341 | tmp = arr[i]; |
2293 | arr[i] = arr[j]; |
2342 | arr[i] = arr[j]; |
2294 | arr[j] = tmp; |
2343 | arr[j] = tmp; |
2295 | } |
2344 | } |
2296 | } |
2345 | } |
2297 | |
2346 | |
2298 | /* new function to make monster searching more efficient, and effective! |
2347 | /* new function to make monster searching more efficient, and effective! |
2299 | * This basically returns a randomized array (in the passed pointer) of |
2348 | * This basically returns a randomized array (in the passed pointer) of |
2300 | * the spaces to find monsters. In this way, it won't always look for |
2349 | * the spaces to find monsters. In this way, it won't always look for |
2301 | * monsters to the north first. However, the size of the array passed |
2350 | * monsters to the north first. However, the size of the array passed |
2302 | * covers all the spaces, so within that size, all the spaces within |
2351 | * covers all the spaces, so within that size, all the spaces within |
2303 | * the 3x3 area will be searched, just not in a predictable order. |
2352 | * the 3x3 area will be searched, just not in a predictable order. |
2304 | */ |
2353 | */ |
|
|
2354 | void |
2305 | void get_search_arr(int *search_arr) |
2355 | get_search_arr (int *search_arr) |
2306 | { |
2356 | { |
|
|
2357 | int |
2307 | int i; |
2358 | i; |
2308 | |
2359 | |
2309 | for(i = 0; i < SIZEOFFREE; i++) |
2360 | for (i = 0; i < SIZEOFFREE; i++) |
2310 | { |
2361 | { |
2311 | search_arr[i] = i; |
2362 | search_arr[i] = i; |
2312 | } |
2363 | } |
2313 | |
2364 | |
2314 | permute(search_arr, 1, SIZEOFFREE1+1); |
2365 | permute (search_arr, 1, SIZEOFFREE1 + 1); |
2315 | permute(search_arr, SIZEOFFREE1+1, SIZEOFFREE2+1); |
2366 | permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); |
2316 | permute(search_arr, SIZEOFFREE2+1, SIZEOFFREE); |
2367 | permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); |
2317 | } |
2368 | } |
2318 | |
2369 | |
2319 | /* |
2370 | /* |
2320 | * find_dir(map, x, y, exclude) will search some close squares in the |
2371 | * find_dir(map, x, y, exclude) will search some close squares in the |
2321 | * given map at the given coordinates for live objects. |
2372 | * given map at the given coordinates for live objects. |
… | |
… | |
2327 | * is actually want is going to try and move there. We need this info |
2378 | * is actually want is going to try and move there. We need this info |
2328 | * because we have to know what movement the thing looking to move |
2379 | * because we have to know what movement the thing looking to move |
2329 | * there is capable of. |
2380 | * there is capable of. |
2330 | */ |
2381 | */ |
2331 | |
2382 | |
|
|
2383 | int |
2332 | int find_dir(mapstruct *m, int x, int y, object *exclude) { |
2384 | find_dir (mapstruct *m, int x, int y, object *exclude) |
|
|
2385 | { |
|
|
2386 | int |
|
|
2387 | i, |
2333 | int i,max=SIZEOFFREE, mflags; |
2388 | max = SIZEOFFREE, mflags; |
2334 | sint16 nx, ny; |
2389 | sint16 |
|
|
2390 | nx, |
|
|
2391 | ny; |
2335 | object *tmp; |
2392 | object * |
|
|
2393 | tmp; |
2336 | mapstruct *mp; |
2394 | mapstruct * |
2337 | MoveType blocked, move_type; |
2395 | mp; |
|
|
2396 | MoveType |
|
|
2397 | blocked, |
|
|
2398 | move_type; |
2338 | |
2399 | |
2339 | if (exclude && exclude->head) { |
2400 | if (exclude && exclude->head) |
|
|
2401 | { |
2340 | exclude = exclude->head; |
2402 | exclude = exclude->head; |
2341 | move_type = exclude->move_type; |
2403 | move_type = exclude->move_type; |
2342 | } else { |
2404 | } |
|
|
2405 | else |
|
|
2406 | { |
2343 | /* If we don't have anything, presume it can use all movement types. */ |
2407 | /* If we don't have anything, presume it can use all movement types. */ |
2344 | move_type=MOVE_ALL; |
2408 | move_type = MOVE_ALL; |
|
|
2409 | } |
|
|
2410 | |
|
|
2411 | for (i = 1; i < max; i++) |
2345 | } |
2412 | { |
2346 | |
2413 | mp = m; |
2347 | for(i=1;i<max;i++) { |
|
|
2348 | mp = m; |
|
|
2349 | nx = x + freearr_x[i]; |
2414 | nx = x + freearr_x[i]; |
2350 | ny = y + freearr_y[i]; |
2415 | ny = y + freearr_y[i]; |
2351 | |
2416 | |
2352 | mflags = get_map_flags(m, &mp, nx, ny, &nx, &ny); |
2417 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
2353 | if (mflags & P_OUT_OF_MAP) { |
2418 | if (mflags & P_OUT_OF_MAP) |
|
|
2419 | { |
2354 | max = maxfree[i]; |
2420 | max = maxfree[i]; |
2355 | } else { |
2421 | } |
|
|
2422 | else |
|
|
2423 | { |
2356 | blocked = GET_MAP_MOVE_BLOCK(mp, nx, ny); |
2424 | blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); |
2357 | |
2425 | |
2358 | if ((move_type & blocked) == move_type) { |
2426 | if ((move_type & blocked) == move_type) |
2359 | max=maxfree[i]; |
2427 | { |
|
|
2428 | max = maxfree[i]; |
|
|
2429 | } |
2360 | } else if (mflags & P_IS_ALIVE) { |
2430 | else if (mflags & P_IS_ALIVE) |
|
|
2431 | { |
2361 | for (tmp=GET_MAP_OB(mp,nx,ny); tmp!= NULL; tmp=tmp->above) { |
2432 | for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) |
2362 | if ((QUERY_FLAG(tmp,FLAG_MONSTER) || tmp->type==PLAYER) && |
2433 | { |
2363 | (tmp != exclude ||(tmp->head && tmp->head != exclude))) { |
2434 | if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) |
2364 | break; |
2435 | { |
2365 | } |
2436 | break; |
2366 | } |
2437 | } |
2367 | if(tmp) { |
2438 | } |
2368 | return freedir[i]; |
2439 | if (tmp) |
2369 | } |
2440 | { |
|
|
2441 | return freedir[i]; |
|
|
2442 | } |
|
|
2443 | } |
|
|
2444 | } |
2370 | } |
2445 | } |
2371 | } |
|
|
2372 | } |
|
|
2373 | return 0; |
2446 | return 0; |
2374 | } |
2447 | } |
2375 | |
2448 | |
2376 | /* |
2449 | /* |
2377 | * distance(object 1, object 2) will return the square of the |
2450 | * distance(object 1, object 2) will return the square of the |
2378 | * distance between the two given objects. |
2451 | * distance between the two given objects. |
2379 | */ |
2452 | */ |
2380 | |
2453 | |
|
|
2454 | int |
2381 | int distance(const object *ob1, const object *ob2) { |
2455 | distance (const object *ob1, const object *ob2) |
|
|
2456 | { |
2382 | int i; |
2457 | int |
2383 | i= (ob1->x - ob2->x)*(ob1->x - ob2->x)+ |
2458 | i; |
2384 | (ob1->y - ob2->y)*(ob1->y - ob2->y); |
2459 | |
|
|
2460 | i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2385 | return i; |
2461 | return i; |
2386 | } |
2462 | } |
2387 | |
2463 | |
2388 | /* |
2464 | /* |
2389 | * find_dir_2(delta-x,delta-y) will return a direction in which |
2465 | * find_dir_2(delta-x,delta-y) will return a direction in which |
2390 | * an object which has subtracted the x and y coordinates of another |
2466 | * an object which has subtracted the x and y coordinates of another |
2391 | * object, needs to travel toward it. |
2467 | * object, needs to travel toward it. |
2392 | */ |
2468 | */ |
2393 | |
2469 | |
|
|
2470 | int |
2394 | int find_dir_2(int x, int y) { |
2471 | find_dir_2 (int x, int y) |
|
|
2472 | { |
2395 | int q; |
2473 | int |
|
|
2474 | q; |
2396 | |
2475 | |
2397 | if(y) |
2476 | if (y) |
2398 | q=x*100/y; |
2477 | q = x * 100 / y; |
2399 | else if (x) |
2478 | else if (x) |
2400 | q= -300*x; |
2479 | q = -300 * x; |
2401 | else |
2480 | else |
2402 | return 0; |
2481 | return 0; |
2403 | |
2482 | |
2404 | if(y>0) { |
2483 | if (y > 0) |
|
|
2484 | { |
2405 | if(q < -242) |
2485 | if (q < -242) |
2406 | return 3 ; |
2486 | return 3; |
2407 | if (q < -41) |
2487 | if (q < -41) |
2408 | return 2 ; |
2488 | return 2; |
2409 | if (q < 41) |
2489 | if (q < 41) |
2410 | return 1 ; |
2490 | return 1; |
2411 | if (q < 242) |
2491 | if (q < 242) |
2412 | return 8 ; |
2492 | return 8; |
2413 | return 7 ; |
2493 | return 7; |
2414 | } |
2494 | } |
2415 | |
2495 | |
2416 | if (q < -242) |
2496 | if (q < -242) |
2417 | return 7 ; |
2497 | return 7; |
2418 | if (q < -41) |
2498 | if (q < -41) |
2419 | return 6 ; |
2499 | return 6; |
2420 | if (q < 41) |
2500 | if (q < 41) |
2421 | return 5 ; |
2501 | return 5; |
2422 | if (q < 242) |
2502 | if (q < 242) |
2423 | return 4 ; |
2503 | return 4; |
2424 | |
2504 | |
2425 | return 3 ; |
2505 | return 3; |
2426 | } |
2506 | } |
2427 | |
2507 | |
2428 | /* |
2508 | /* |
2429 | * absdir(int): Returns a number between 1 and 8, which represent |
2509 | * absdir(int): Returns a number between 1 and 8, which represent |
2430 | * the "absolute" direction of a number (it actually takes care of |
2510 | * the "absolute" direction of a number (it actually takes care of |
2431 | * "overflow" in previous calculations of a direction). |
2511 | * "overflow" in previous calculations of a direction). |
2432 | */ |
2512 | */ |
2433 | |
2513 | |
|
|
2514 | int |
2434 | int absdir(int d) { |
2515 | absdir (int d) |
2435 | while(d<1) d+=8; |
2516 | { |
2436 | while(d>8) d-=8; |
2517 | while (d < 1) |
|
|
2518 | d += 8; |
|
|
2519 | while (d > 8) |
|
|
2520 | d -= 8; |
2437 | return d; |
2521 | return d; |
2438 | } |
2522 | } |
2439 | |
2523 | |
2440 | /* |
2524 | /* |
2441 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2525 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2442 | * between two directions (which are expected to be absolute (see absdir()) |
2526 | * between two directions (which are expected to be absolute (see absdir()) |
2443 | */ |
2527 | */ |
2444 | |
2528 | |
|
|
2529 | int |
2445 | int dirdiff(int dir1, int dir2) { |
2530 | dirdiff (int dir1, int dir2) |
|
|
2531 | { |
2446 | int d; |
2532 | int |
|
|
2533 | d; |
|
|
2534 | |
2447 | d = abs(dir1 - dir2); |
2535 | d = abs (dir1 - dir2); |
2448 | if(d>4) |
2536 | if (d > 4) |
2449 | d = 8 - d; |
2537 | d = 8 - d; |
2450 | return d; |
2538 | return d; |
2451 | } |
2539 | } |
2452 | |
2540 | |
2453 | /* peterm: |
2541 | /* peterm: |
… | |
… | |
2458 | * direction 4, 14, or 16 to get back to where we are. |
2546 | * direction 4, 14, or 16 to get back to where we are. |
2459 | * Moved from spell_util.c to object.c with the other related direction |
2547 | * Moved from spell_util.c to object.c with the other related direction |
2460 | * functions. |
2548 | * functions. |
2461 | */ |
2549 | */ |
2462 | |
2550 | |
|
|
2551 | int |
2463 | int reduction_dir[SIZEOFFREE][3] = { |
2552 | reduction_dir[SIZEOFFREE][3] = { |
2464 | {0,0,0}, /* 0 */ |
2553 | {0, 0, 0}, /* 0 */ |
2465 | {0,0,0}, /* 1 */ |
2554 | {0, 0, 0}, /* 1 */ |
2466 | {0,0,0}, /* 2 */ |
2555 | {0, 0, 0}, /* 2 */ |
2467 | {0,0,0}, /* 3 */ |
2556 | {0, 0, 0}, /* 3 */ |
2468 | {0,0,0}, /* 4 */ |
2557 | {0, 0, 0}, /* 4 */ |
2469 | {0,0,0}, /* 5 */ |
2558 | {0, 0, 0}, /* 5 */ |
2470 | {0,0,0}, /* 6 */ |
2559 | {0, 0, 0}, /* 6 */ |
2471 | {0,0,0}, /* 7 */ |
2560 | {0, 0, 0}, /* 7 */ |
2472 | {0,0,0}, /* 8 */ |
2561 | {0, 0, 0}, /* 8 */ |
2473 | {8,1,2}, /* 9 */ |
2562 | {8, 1, 2}, /* 9 */ |
2474 | {1,2,-1}, /* 10 */ |
2563 | {1, 2, -1}, /* 10 */ |
2475 | {2,10,12}, /* 11 */ |
2564 | {2, 10, 12}, /* 11 */ |
2476 | {2,3,-1}, /* 12 */ |
2565 | {2, 3, -1}, /* 12 */ |
2477 | {2,3,4}, /* 13 */ |
2566 | {2, 3, 4}, /* 13 */ |
2478 | {3,4,-1}, /* 14 */ |
2567 | {3, 4, -1}, /* 14 */ |
2479 | {4,14,16}, /* 15 */ |
2568 | {4, 14, 16}, /* 15 */ |
2480 | {5,4,-1}, /* 16 */ |
2569 | {5, 4, -1}, /* 16 */ |
2481 | {4,5,6}, /* 17 */ |
2570 | {4, 5, 6}, /* 17 */ |
2482 | {6,5,-1}, /* 18 */ |
2571 | {6, 5, -1}, /* 18 */ |
2483 | {6,20,18}, /* 19 */ |
2572 | {6, 20, 18}, /* 19 */ |
2484 | {7,6,-1}, /* 20 */ |
2573 | {7, 6, -1}, /* 20 */ |
2485 | {6,7,8}, /* 21 */ |
2574 | {6, 7, 8}, /* 21 */ |
2486 | {7,8,-1}, /* 22 */ |
2575 | {7, 8, -1}, /* 22 */ |
2487 | {8,22,24}, /* 23 */ |
2576 | {8, 22, 24}, /* 23 */ |
2488 | {8,1,-1}, /* 24 */ |
2577 | {8, 1, -1}, /* 24 */ |
2489 | {24,9,10}, /* 25 */ |
2578 | {24, 9, 10}, /* 25 */ |
2490 | {9,10,-1}, /* 26 */ |
2579 | {9, 10, -1}, /* 26 */ |
2491 | {10,11,-1}, /* 27 */ |
2580 | {10, 11, -1}, /* 27 */ |
2492 | {27,11,29}, /* 28 */ |
2581 | {27, 11, 29}, /* 28 */ |
2493 | {11,12,-1}, /* 29 */ |
2582 | {11, 12, -1}, /* 29 */ |
2494 | {12,13,-1}, /* 30 */ |
2583 | {12, 13, -1}, /* 30 */ |
2495 | {12,13,14}, /* 31 */ |
2584 | {12, 13, 14}, /* 31 */ |
2496 | {13,14,-1}, /* 32 */ |
2585 | {13, 14, -1}, /* 32 */ |
2497 | {14,15,-1}, /* 33 */ |
2586 | {14, 15, -1}, /* 33 */ |
2498 | {33,15,35}, /* 34 */ |
2587 | {33, 15, 35}, /* 34 */ |
2499 | {16,15,-1}, /* 35 */ |
2588 | {16, 15, -1}, /* 35 */ |
2500 | {17,16,-1}, /* 36 */ |
2589 | {17, 16, -1}, /* 36 */ |
2501 | {18,17,16}, /* 37 */ |
2590 | {18, 17, 16}, /* 37 */ |
2502 | {18,17,-1}, /* 38 */ |
2591 | {18, 17, -1}, /* 38 */ |
2503 | {18,19,-1}, /* 39 */ |
2592 | {18, 19, -1}, /* 39 */ |
2504 | {41,19,39}, /* 40 */ |
2593 | {41, 19, 39}, /* 40 */ |
2505 | {19,20,-1}, /* 41 */ |
2594 | {19, 20, -1}, /* 41 */ |
2506 | {20,21,-1}, /* 42 */ |
2595 | {20, 21, -1}, /* 42 */ |
2507 | {20,21,22}, /* 43 */ |
2596 | {20, 21, 22}, /* 43 */ |
2508 | {21,22,-1}, /* 44 */ |
2597 | {21, 22, -1}, /* 44 */ |
2509 | {23,22,-1}, /* 45 */ |
2598 | {23, 22, -1}, /* 45 */ |
2510 | {45,47,23}, /* 46 */ |
2599 | {45, 47, 23}, /* 46 */ |
2511 | {23,24,-1}, /* 47 */ |
2600 | {23, 24, -1}, /* 47 */ |
2512 | {24,9,-1}}; /* 48 */ |
2601 | {24, 9, -1} |
|
|
2602 | }; /* 48 */ |
2513 | |
2603 | |
2514 | /* Recursive routine to step back and see if we can |
2604 | /* Recursive routine to step back and see if we can |
2515 | * find a path to that monster that we found. If not, |
2605 | * find a path to that monster that we found. If not, |
2516 | * we don't bother going toward it. Returns 1 if we |
2606 | * we don't bother going toward it. Returns 1 if we |
2517 | * can see a direct way to get it |
2607 | * can see a direct way to get it |
2518 | * Modified to be map tile aware -.MSW |
2608 | * Modified to be map tile aware -.MSW |
2519 | */ |
2609 | */ |
2520 | |
|
|
2521 | |
2610 | |
|
|
2611 | |
|
|
2612 | int |
2522 | int can_see_monsterP(mapstruct *m, int x, int y,int dir) { |
2613 | can_see_monsterP (mapstruct *m, int x, int y, int dir) |
2523 | sint16 dx, dy; |
2614 | { |
|
|
2615 | sint16 |
|
|
2616 | dx, |
|
|
2617 | dy; |
|
|
2618 | int |
2524 | int mflags; |
2619 | mflags; |
2525 | |
2620 | |
|
|
2621 | if (dir < 0) |
2526 | if(dir<0) return 0; /* exit condition: invalid direction */ |
2622 | return 0; /* exit condition: invalid direction */ |
2527 | |
2623 | |
2528 | dx = x + freearr_x[dir]; |
2624 | dx = x + freearr_x[dir]; |
2529 | dy = y + freearr_y[dir]; |
2625 | dy = y + freearr_y[dir]; |
2530 | |
2626 | |
2531 | mflags = get_map_flags(m, &m, dx, dy, &dx, &dy); |
2627 | mflags = get_map_flags (m, &m, dx, dy, &dx, &dy); |
2532 | |
2628 | |
2533 | /* This functional arguably was incorrect before - it was |
2629 | /* This functional arguably was incorrect before - it was |
2534 | * checking for P_WALL - that was basically seeing if |
2630 | * checking for P_WALL - that was basically seeing if |
2535 | * we could move to the monster - this is being more |
2631 | * we could move to the monster - this is being more |
2536 | * literal on if we can see it. To know if we can actually |
2632 | * literal on if we can see it. To know if we can actually |
2537 | * move to the monster, we'd need the monster passed in or |
2633 | * move to the monster, we'd need the monster passed in or |
2538 | * at least its move type. |
2634 | * at least its move type. |
2539 | */ |
2635 | */ |
2540 | if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW)) return 0; |
2636 | if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW)) |
|
|
2637 | return 0; |
2541 | |
2638 | |
2542 | /* yes, can see. */ |
2639 | /* yes, can see. */ |
2543 | if(dir < 9) return 1; |
2640 | if (dir < 9) |
|
|
2641 | return 1; |
2544 | return can_see_monsterP(m, x, y, reduction_dir[dir][0]) | |
2642 | return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | |
2545 | can_see_monsterP(m,x,y, reduction_dir[dir][1]) | |
2643 | can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); |
2546 | can_see_monsterP(m,x,y, reduction_dir[dir][2]); |
|
|
2547 | } |
2644 | } |
2548 | |
2645 | |
2549 | |
2646 | |
2550 | |
2647 | |
2551 | /* |
2648 | /* |
2552 | * can_pick(picker, item): finds out if an object is possible to be |
2649 | * can_pick(picker, item): finds out if an object is possible to be |
2553 | * picked up by the picker. Returnes 1 if it can be |
2650 | * picked up by the picker. Returnes 1 if it can be |
2554 | * picked up, otherwise 0. |
2651 | * picked up, otherwise 0. |
2555 | * |
2652 | * |
… | |
… | |
2557 | * core dumps if they do. |
2654 | * core dumps if they do. |
2558 | * |
2655 | * |
2559 | * Add a check so we can't pick up invisible objects (0.93.8) |
2656 | * Add a check so we can't pick up invisible objects (0.93.8) |
2560 | */ |
2657 | */ |
2561 | |
2658 | |
|
|
2659 | int |
2562 | int can_pick(const object *who, const object *item) { |
2660 | can_pick (const object *who, const object *item) |
|
|
2661 | { |
2563 | return /*QUERY_FLAG(who,FLAG_WIZ)||*/ |
2662 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2564 | (item->weight>0&&!QUERY_FLAG(item,FLAG_NO_PICK)&& |
2663 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2565 | !QUERY_FLAG(item,FLAG_ALIVE)&&!item->invisible && |
2664 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2566 | (who->type==PLAYER||item->weight<who->weight/3)); |
|
|
2567 | } |
2665 | } |
2568 | |
2666 | |
2569 | |
2667 | |
2570 | /* |
2668 | /* |
2571 | * create clone from object to another |
2669 | * create clone from object to another |
2572 | */ |
2670 | */ |
|
|
2671 | object * |
2573 | object *object_create_clone (object *asrc) { |
2672 | object_create_clone (object *asrc) |
|
|
2673 | { |
|
|
2674 | object * |
2574 | object *dst = NULL,*tmp,*src,*part,*prev, *item; |
2675 | dst = NULL, *tmp, *src, *part, *prev, *item; |
2575 | |
2676 | |
|
|
2677 | if (!asrc) |
2576 | if(!asrc) return NULL; |
2678 | return NULL; |
2577 | src = asrc; |
2679 | src = asrc; |
2578 | if(src->head) |
2680 | if (src->head) |
2579 | src = src->head; |
2681 | src = src->head; |
2580 | |
2682 | |
2581 | prev = NULL; |
2683 | prev = NULL; |
2582 | for(part = src; part; part = part->more) { |
2684 | for (part = src; part; part = part->more) |
|
|
2685 | { |
2583 | tmp = get_object(); |
2686 | tmp = get_object (); |
2584 | copy_object(part,tmp); |
2687 | copy_object (part, tmp); |
2585 | tmp->x -= src->x; |
2688 | tmp->x -= src->x; |
2586 | tmp->y -= src->y; |
2689 | tmp->y -= src->y; |
2587 | if(!part->head) { |
2690 | if (!part->head) |
|
|
2691 | { |
2588 | dst = tmp; |
2692 | dst = tmp; |
2589 | tmp->head = NULL; |
2693 | tmp->head = NULL; |
|
|
2694 | } |
2590 | } else { |
2695 | else |
|
|
2696 | { |
2591 | tmp->head = dst; |
2697 | tmp->head = dst; |
2592 | } |
2698 | } |
2593 | tmp->more = NULL; |
2699 | tmp->more = NULL; |
2594 | if(prev) |
2700 | if (prev) |
2595 | prev->more = tmp; |
2701 | prev->more = tmp; |
2596 | prev = tmp; |
2702 | prev = tmp; |
2597 | } |
2703 | } |
|
|
2704 | |
2598 | /*** copy inventory ***/ |
2705 | /*** copy inventory ***/ |
2599 | for(item = src->inv; item; item = item->below) { |
2706 | for (item = src->inv; item; item = item->below) |
|
|
2707 | { |
2600 | (void) insert_ob_in_ob(object_create_clone(item),dst); |
2708 | (void) insert_ob_in_ob (object_create_clone (item), dst); |
2601 | } |
2709 | } |
2602 | |
2710 | |
2603 | return dst; |
2711 | return dst; |
2604 | } |
2712 | } |
2605 | |
2713 | |
2606 | /* return true if the object was destroyed, 0 otherwise */ |
2714 | /* return true if the object was destroyed, 0 otherwise */ |
|
|
2715 | int |
2607 | int was_destroyed (const object *op, tag_t old_tag) |
2716 | was_destroyed (const object *op, tag_t old_tag) |
2608 | { |
2717 | { |
2609 | /* checking for FLAG_FREED isn't necessary, but makes this function more |
2718 | /* checking for FLAG_FREED isn't necessary, but makes this function more |
2610 | * robust */ |
2719 | * robust */ |
2611 | return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED); |
2720 | return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED); |
2612 | } |
2721 | } |
2613 | |
2722 | |
2614 | /* GROS - Creates an object using a string representing its content. */ |
2723 | /* GROS - Creates an object using a string representing its content. */ |
|
|
2724 | |
2615 | /* Basically, we save the content of the string to a temp file, then call */ |
2725 | /* Basically, we save the content of the string to a temp file, then call */ |
|
|
2726 | |
2616 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
2727 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
|
|
2728 | |
2617 | /* but it was simple to make and allows reusing the load_object function. */ |
2729 | /* but it was simple to make and allows reusing the load_object function. */ |
|
|
2730 | |
2618 | /* Remember not to use load_object_str in a time-critical situation. */ |
2731 | /* Remember not to use load_object_str in a time-critical situation. */ |
|
|
2732 | |
2619 | /* Also remember that multiparts objects are not supported for now. */ |
2733 | /* Also remember that multiparts objects are not supported for now. */ |
2620 | |
2734 | |
|
|
2735 | object * |
2621 | object* load_object_str(const char *obstr) |
2736 | load_object_str (const char *obstr) |
2622 | { |
2737 | { |
2623 | object *op; |
2738 | object * |
2624 | FILE *tempfile; |
2739 | op; |
|
|
2740 | char |
2625 | char filename[MAX_BUF]; |
2741 | filename[MAX_BUF]; |
|
|
2742 | |
2626 | sprintf(filename,"%s/cfloadobstr2044",settings.tmpdir); |
2743 | sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); |
|
|
2744 | |
|
|
2745 | FILE * |
2627 | tempfile=fopen(filename,"w"); |
2746 | tempfile = fopen (filename, "w"); |
|
|
2747 | |
2628 | if (tempfile == NULL) |
2748 | if (tempfile == NULL) |
2629 | { |
2749 | { |
2630 | LOG(llevError,"Error - Unable to access load object temp file\n"); |
2750 | LOG (llevError, "Error - Unable to access load object temp file\n"); |
2631 | return NULL; |
2751 | return NULL; |
2632 | }; |
2752 | }; |
2633 | fprintf(tempfile,obstr); |
2753 | fprintf (tempfile, obstr); |
2634 | fclose(tempfile); |
2754 | fclose (tempfile); |
2635 | |
2755 | |
2636 | op=get_object(); |
2756 | op = get_object (); |
2637 | |
2757 | |
2638 | tempfile=fopen(filename,"r"); |
2758 | object_thawer |
2639 | if (tempfile == NULL) |
2759 | thawer (filename); |
2640 | { |
2760 | |
2641 | LOG(llevError,"Error - Unable to read object temp file\n"); |
2761 | if (thawer) |
2642 | return NULL; |
2762 | load_object (thawer, op, 0); |
2643 | }; |
2763 | |
2644 | load_object(tempfile,op,LO_NEWFILE,0); |
|
|
2645 | LOG(llevDebug," load str completed, object=%s\n",op->name); |
2764 | LOG (llevDebug, " load str completed, object=%s\n", &op->name); |
2646 | CLEAR_FLAG(op,FLAG_REMOVED); |
2765 | CLEAR_FLAG (op, FLAG_REMOVED); |
2647 | fclose(tempfile); |
2766 | |
2648 | return op; |
2767 | return op; |
2649 | } |
2768 | } |
2650 | |
2769 | |
2651 | /* This returns the first object in who's inventory that |
2770 | /* This returns the first object in who's inventory that |
2652 | * has the same type and subtype match. |
2771 | * has the same type and subtype match. |
2653 | * returns NULL if no match. |
2772 | * returns NULL if no match. |
2654 | */ |
2773 | */ |
|
|
2774 | object * |
2655 | object *find_obj_by_type_subtype(const object *who, int type, int subtype) |
2775 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2656 | { |
2776 | { |
2657 | object *tmp; |
2777 | object * |
|
|
2778 | tmp; |
2658 | |
2779 | |
2659 | for (tmp=who->inv; tmp; tmp=tmp->below) |
2780 | for (tmp = who->inv; tmp; tmp = tmp->below) |
2660 | if (tmp->type == type && tmp->subtype == subtype) return tmp; |
2781 | if (tmp->type == type && tmp->subtype == subtype) |
|
|
2782 | return tmp; |
2661 | |
2783 | |
2662 | return NULL; |
2784 | return NULL; |
2663 | } |
2785 | } |
2664 | |
2786 | |
2665 | /* If ob has a field named key, return the link from the list, |
2787 | /* If ob has a field named key, return the link from the list, |
2666 | * otherwise return NULL. |
2788 | * otherwise return NULL. |
2667 | * |
2789 | * |
2668 | * key must be a passed in shared string - otherwise, this won't |
2790 | * key must be a passed in shared string - otherwise, this won't |
2669 | * do the desired thing. |
2791 | * do the desired thing. |
2670 | */ |
2792 | */ |
|
|
2793 | key_value * |
2671 | key_value * get_ob_key_link(const object * ob, const char * key) { |
2794 | get_ob_key_link (const object *ob, const char *key) |
|
|
2795 | { |
2672 | key_value * link; |
2796 | key_value * |
2673 | |
2797 | link; |
|
|
2798 | |
2674 | for (link = ob->key_values; link != NULL; link = link->next) { |
2799 | for (link = ob->key_values; link != NULL; link = link->next) |
|
|
2800 | { |
2675 | if (link->key == key) { |
2801 | if (link->key == key) |
|
|
2802 | { |
2676 | return link; |
2803 | return link; |
2677 | } |
2804 | } |
2678 | } |
|
|
2679 | |
2805 | } |
|
|
2806 | |
2680 | return NULL; |
2807 | return NULL; |
2681 | } |
2808 | } |
2682 | |
2809 | |
2683 | /* |
2810 | /* |
2684 | * Returns the value of op has an extra_field for key, or NULL. |
2811 | * Returns the value of op has an extra_field for key, or NULL. |
2685 | * |
2812 | * |
2686 | * The argument doesn't need to be a shared string. |
2813 | * The argument doesn't need to be a shared string. |
2687 | * |
2814 | * |
2688 | * The returned string is shared. |
2815 | * The returned string is shared. |
2689 | */ |
2816 | */ |
|
|
2817 | const char * |
2690 | const char * get_ob_key_value(const object * op, const char * const key) { |
2818 | get_ob_key_value (const object *op, const char *const key) |
|
|
2819 | { |
2691 | key_value * link; |
2820 | key_value * |
2692 | const char * canonical_key; |
2821 | link; |
2693 | |
2822 | const char * |
|
|
2823 | canonical_key; |
|
|
2824 | |
2694 | canonical_key = find_string(key); |
2825 | canonical_key = shstr::find (key); |
2695 | |
2826 | |
2696 | if (canonical_key == NULL) { |
2827 | if (canonical_key == NULL) |
|
|
2828 | { |
2697 | /* 1. There being a field named key on any object |
2829 | /* 1. There being a field named key on any object |
2698 | * implies there'd be a shared string to find. |
2830 | * implies there'd be a shared string to find. |
2699 | * 2. Since there isn't, no object has this field. |
2831 | * 2. Since there isn't, no object has this field. |
2700 | * 3. Therefore, *this* object doesn't have this field. |
2832 | * 3. Therefore, *this* object doesn't have this field. |
2701 | */ |
2833 | */ |
2702 | return NULL; |
2834 | return NULL; |
2703 | } |
2835 | } |
2704 | |
2836 | |
2705 | /* This is copied from get_ob_key_link() above - |
2837 | /* This is copied from get_ob_key_link() above - |
2706 | * only 4 lines, and saves the function call overhead. |
2838 | * only 4 lines, and saves the function call overhead. |
2707 | */ |
2839 | */ |
2708 | for (link = op->key_values; link != NULL; link = link->next) { |
2840 | for (link = op->key_values; link != NULL; link = link->next) |
|
|
2841 | { |
2709 | if (link->key == canonical_key) { |
2842 | if (link->key == canonical_key) |
|
|
2843 | { |
2710 | return link->value; |
2844 | return link->value; |
2711 | } |
2845 | } |
2712 | } |
2846 | } |
2713 | return NULL; |
2847 | return NULL; |
2714 | } |
2848 | } |
2715 | |
2849 | |
2716 | |
2850 | |
2717 | /* |
2851 | /* |
2718 | * Updates the canonical_key in op to value. |
2852 | * Updates the canonical_key in op to value. |
… | |
… | |
2722 | * Unless add_key is TRUE, it won't add fields, only change the value of existing |
2856 | * Unless add_key is TRUE, it won't add fields, only change the value of existing |
2723 | * keys. |
2857 | * keys. |
2724 | * |
2858 | * |
2725 | * Returns TRUE on success. |
2859 | * Returns TRUE on success. |
2726 | */ |
2860 | */ |
|
|
2861 | int |
2727 | int set_ob_key_value_s(object * op, const char * canonical_key, const char * value, int add_key) { |
2862 | set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) |
|
|
2863 | { |
|
|
2864 | key_value * |
2728 | key_value * field = NULL, *last=NULL; |
2865 | field = NULL, *last = NULL; |
2729 | |
2866 | |
2730 | for (field=op->key_values; field != NULL; field=field->next) { |
2867 | for (field = op->key_values; field != NULL; field = field->next) |
2731 | if (field->key != canonical_key) { |
|
|
2732 | last = field; |
|
|
2733 | continue; |
|
|
2734 | } |
|
|
2735 | |
2868 | { |
2736 | if (field->value) FREE_AND_CLEAR_STR(field->value); |
2869 | if (field->key != canonical_key) |
2737 | if (value) |
2870 | { |
2738 | field->value = add_string(value); |
2871 | last = field; |
2739 | else { |
2872 | continue; |
|
|
2873 | } |
|
|
2874 | |
|
|
2875 | if (value) |
|
|
2876 | field->value = value; |
|
|
2877 | else |
|
|
2878 | { |
2740 | /* Basically, if the archetype has this key set, |
2879 | /* Basically, if the archetype has this key set, |
2741 | * we need to store the null value so when we save |
2880 | * we need to store the null value so when we save |
2742 | * it, we save the empty value so that when we load, |
2881 | * it, we save the empty value so that when we load, |
2743 | * we get this value back again. |
2882 | * we get this value back again. |
2744 | */ |
2883 | */ |
2745 | if (get_ob_key_link(&op->arch->clone, canonical_key)) |
2884 | if (get_ob_key_link (&op->arch->clone, canonical_key)) |
2746 | field->value = NULL; |
2885 | field->value = 0; |
2747 | else { |
2886 | else |
2748 | /* Delete this link */ |
2887 | { |
2749 | if (field->key) FREE_AND_CLEAR_STR(field->key); |
2888 | if (last) |
2750 | if (field->value) FREE_AND_CLEAR_STR(field->value); |
2889 | last->next = field->next; |
2751 | if (last) last->next = field->next; |
2890 | else |
2752 | else op->key_values = field->next; |
2891 | op->key_values = field->next; |
2753 | free(field); |
2892 | |
2754 | } |
2893 | delete |
2755 | } |
2894 | field; |
|
|
2895 | } |
|
|
2896 | } |
2756 | return TRUE; |
2897 | return TRUE; |
2757 | } |
2898 | } |
2758 | /* IF we get here, key doesn't exist */ |
2899 | /* IF we get here, key doesn't exist */ |
2759 | |
2900 | |
2760 | /* No field, we'll have to add it. */ |
2901 | /* No field, we'll have to add it. */ |
|
|
2902 | |
|
|
2903 | if (!add_key) |
2761 | |
2904 | { |
2762 | if (!add_key) { |
|
|
2763 | return FALSE; |
2905 | return FALSE; |
2764 | } |
2906 | } |
2765 | /* There isn't any good reason to store a null |
2907 | /* There isn't any good reason to store a null |
2766 | * value in the key/value list. If the archetype has |
2908 | * value in the key/value list. If the archetype has |
2767 | * this key, then we should also have it, so shouldn't |
2909 | * this key, then we should also have it, so shouldn't |
2768 | * be here. If user wants to store empty strings, |
2910 | * be here. If user wants to store empty strings, |
2769 | * should pass in "" |
2911 | * should pass in "" |
2770 | */ |
2912 | */ |
2771 | if (value == NULL) return TRUE; |
2913 | if (value == NULL) |
2772 | |
|
|
2773 | field = (key_value *) malloc(sizeof(key_value)); |
|
|
2774 | |
|
|
2775 | field->key = add_refcount(canonical_key); |
|
|
2776 | field->value = add_string(value); |
|
|
2777 | /* Usual prepend-addition. */ |
|
|
2778 | field->next = op->key_values; |
|
|
2779 | op->key_values = field; |
|
|
2780 | |
|
|
2781 | return TRUE; |
2914 | return TRUE; |
|
|
2915 | |
|
|
2916 | field = new key_value; |
|
|
2917 | |
|
|
2918 | field->key = canonical_key; |
|
|
2919 | field->value = value; |
|
|
2920 | /* Usual prepend-addition. */ |
|
|
2921 | field->next = op->key_values; |
|
|
2922 | op->key_values = field; |
|
|
2923 | |
|
|
2924 | return TRUE; |
2782 | } |
2925 | } |
2783 | |
2926 | |
2784 | /* |
2927 | /* |
2785 | * Updates the key in op to value. |
2928 | * Updates the key in op to value. |
2786 | * |
2929 | * |
… | |
… | |
2788 | * and not add new ones. |
2931 | * and not add new ones. |
2789 | * In general, should be little reason FALSE is ever passed in for add_key |
2932 | * In general, should be little reason FALSE is ever passed in for add_key |
2790 | * |
2933 | * |
2791 | * Returns TRUE on success. |
2934 | * Returns TRUE on success. |
2792 | */ |
2935 | */ |
|
|
2936 | int |
2793 | int set_ob_key_value(object * op, const char * key, const char * value, int add_key) { |
2937 | set_ob_key_value (object *op, const char *key, const char *value, int add_key) |
2794 | const char * canonical_key = NULL; |
2938 | { |
2795 | int floating_ref = FALSE; |
2939 | shstr |
2796 | int ret; |
2940 | key_ (key); |
2797 | |
2941 | |
2798 | /* HACK This mess is to make sure set_ob_value() passes a shared string |
|
|
2799 | * to get_ob_key_link(), without leaving a leaked refcount. |
|
|
2800 | */ |
|
|
2801 | |
|
|
2802 | canonical_key = find_string(key); |
|
|
2803 | if (canonical_key == NULL) { |
|
|
2804 | canonical_key = add_string(key); |
|
|
2805 | floating_ref = TRUE; |
|
|
2806 | } |
|
|
2807 | |
|
|
2808 | ret = set_ob_key_value_s(op, canonical_key, value, add_key); |
2942 | return set_ob_key_value_s (op, key_, value, add_key); |
2809 | |
|
|
2810 | if (floating_ref) { |
|
|
2811 | free_string(canonical_key); |
|
|
2812 | } |
|
|
2813 | |
|
|
2814 | return ret; |
|
|
2815 | } |
2943 | } |