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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.1 by elmex, Sun Aug 13 17:16:00 2006 UTC vs.
Revision 1.35 by root, Tue Sep 12 18:15:34 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines