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.2 by root, Fri Aug 25 17:11:52 2006 UTC vs.
Revision 1.28 by root, Mon Sep 11 12:10:21 2006 UTC

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

Diff Legend

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