ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.1 by elmex, Sun Aug 13 17:16:00 2006 UTC vs.
Revision 1.26 by root, Mon Sep 11 11:46:52 2006 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines