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.12 by elmex, Sun Sep 3 14:33:47 2006 UTC vs.
Revision 1.25 by root, Mon Sep 11 01:16:20 2006 UTC

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

Diff Legend

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